diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 18:50:17 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 18:50:17 +0400 |
| commit | 98014be39bda8277a5ad130bb274ed6eb18b74df (patch) | |
| tree | 974620a47c9350ff9b3c06ffd2b49470bbda72ab /drivers/base/power/clock_ops.c | |
| parent | 55135dfbf3dd83cb3e98deed8271b62d188404e1 (diff) | |
| parent | 6e2a587eb99267367409097b70cb2d61b09e5269 (diff) | |
| download | linux-98014be39bda8277a5ad130bb274ed6eb18b74df.tar.xz | |
Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes
Diffstat (limited to 'drivers/base/power/clock_ops.c')
| -rw-r--r-- | drivers/base/power/clock_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index 5f0f85d5c576..428e55e012dc 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -229,7 +229,8 @@ int pm_clk_suspend(struct device *dev) list_for_each_entry_reverse(ce, &psd->clock_list, node) { if (ce->status < PCE_STATUS_ERROR) { - clk_disable(ce->clk); + if (ce->status == PCE_STATUS_ENABLED) + clk_disable(ce->clk); ce->status = PCE_STATUS_ACQUIRED; } } |