diff --git a/[refs] b/[refs]
index ac9ccd0391fa..2aa36fe15b34 100644
--- 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
index 5f0f85d5c576..428e55e012dc 100644
--- 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;
 		}
 	}