From: Insu Yun <wuninsu@gmail.com>
Date: Sat, 30 Jan 2016 15:12:04 +0000 (-0500)
Subject: clk: unlock for handling unregistered clock
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4106a3d9ebb9839a8e93b0116c0f94dc4f10e4b2;p=openwrt%2Fstaging%2Fblogic.git

clk: unlock for handling unregistered clock

If clock is already unregistered, it returns with holding lock.
It needs to be unlocked.

Signed-off-by: Insu Yun <wuninsu@gmail.com>
[sboyd@codeaurora.org: Use goto instead]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index d31ed95d27a4..bb01ed6cc63e 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2641,7 +2641,7 @@ void clk_unregister(struct clk *clk)
 	if (clk->core->ops == &clk_nodrv_ops) {
 		pr_err("%s: unregistered clock: %s\n", __func__,
 		       clk->core->name);
-		return;
+		goto unlock;
 	}
 	/*
 	 * Assign empty clock ops for consumers that might still hold
@@ -2667,7 +2667,7 @@ void clk_unregister(struct clk *clk)
 		pr_warn("%s: unregistering prepared clock: %s\n",
 					__func__, clk->core->name);
 	kref_put(&clk->core->ref, __clk_release);
-
+unlock:
 	clk_prepare_unlock();
 }
 EXPORT_SYMBOL_GPL(clk_unregister);