From daf4360b2678f66ed6b7d5e6b9652f7a87acfa5c Mon Sep 17 00:00:00 2001
From: Jonghwan Choi <jhbird.choi@samsung.com>
Date: Sat, 22 Oct 2011 00:22:54 +0200
Subject: [PATCH] --- yaml --- r: 267099 b: refs/heads/master c:
 0ab1e79b825a5cd8aeb3b34d89c9a89dea900056 h: refs/heads/master i:   267097:
 74a51a4790099cc629378fbcd8afd4c53e476e42   267095:
 8357033784a4d260e34fe2de58de17ec7d5d080d v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/base/power/clock_ops.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

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);
 }