[-next] clk: keystone: fix return value check in _of_pll_clk_init()

Commit Message

Wei Yongjun Oct. 31, 2013, 10:36 a.m. UTC

From: Wei Yongjun <[e-mail]>

clk_register_pll() returns ERR_PTR() when memory alloc fail and NULL
in the other case, the user of this function should used IS_ERR_OR_NULL()
to check the return value. this patch change clk_register_pll() to return
only ERR_PTR(), and also fixed the user.

Signed-off-by: Wei Yongjun <[e-mail]>
---
 drivers/clk/keystone/pll.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Patch

diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
index 47a1bd9..78a6e0e 100644
--- a/drivers/clk/keystone/pll.c
+++ b/drivers/clk/keystone/pll.c
@@ -127,12 +127,9 @@  static struct clk *clk_register_pll(struct device *dev,
 
 	clk = clk_register(NULL, &pll->hw);
 	if (IS_ERR(clk))
-		goto out;
+		kfree(pll);
 
 	return clk;
-out:
-	kfree(pll);
-	return NULL;
 }
 
 /**
@@ -182,7 +179,7 @@  static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
 	}
 
 	clk = clk_register_pll(NULL, node->name, parent_name, pll_data);
-	if (clk) {
+	if (!IS_ERR(clk)) {
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
 		return;
 	}