diff --git a/[refs] b/[refs]
index 15635c2afb17..dae1d5bdfbf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fef9fc83fbd7293ea9fe665d14046422ebf4219
+refs/heads/master: 0ab1e79b825a5cd8aeb3b34d89c9a89dea900056
diff --git a/trunk/drivers/base/power/clock_ops.c b/trunk/drivers/base/power/clock_ops.c
index b876e60a53ef..5f0f85d5c576 100644
--- a/trunk/drivers/base/power/clock_ops.c
+++ b/trunk/drivers/base/power/clock_ops.c
@@ -104,9 +104,7 @@ static void __pm_clk_remove(struct pm_clock_entry *ce)
 			clk_put(ce->clk);
 	}
 
-	if (ce->con_id)
-		kfree(ce->con_id);
-
+	kfree(ce->con_id);
 	kfree(ce);
 }