diff options
| author | Andy Green <andy.green@linaro.org> | 2011-12-29 13:38:48 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-29 13:39:58 +0800 |
| commit | 2b176282ccd60b683ed176dc6dfc3b475702dd3c (patch) | |
| tree | e7ea972472c6f0e34db15ad1bbc84728f50ffc70 | |
| parent | 4572e78b859fa8887e8b1e562579420d8e3f475f (diff) | |
omap sr skip disable if rpm disabled as in early suspend
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 671a5d29559..5520f314c40 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -608,9 +608,9 @@ void sr_disable(struct voltagedomain *voltdm) } /* Check if SR clocks are already disabled. If yes do nothing */ - if (pm_runtime_suspended(&sr->pdev->dev)) + if (!pm_runtime_enabled(&sr->pdev->dev) || + pm_runtime_suspended(&sr->pdev->dev)) return; - /* * Disable SR if only it is indeed enabled. Else just * disable the clocks. |