---

yaml --- r: 275619 b: refs/heads/master c: 2405095 h: refs/heads/master i: 275617: b8f55bf 275615: c029e98 v: v3
git-mirror · Nov 9, 2011 · f052dc3 · f052dc3
1 parent 8b2c2c4
commit f052dc3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 056879d2f244001b2888cdc8cf868c33ca8b23a0
+refs/heads/master: 24050956e029a9ecff096e1992869ada4492963c
diff --git a/trunk/drivers/base/power/clock_ops.c b/trunk/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;
 		}
 	}