From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 1 Nov 2012 05:33:55 +0000 (+0800)
Subject: CLK: clk-twl6040: fix return value check in twl6040_clk_probe()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ddc07ef9499509200033be7e387feb6c83744a73;p=openwrt%2Fstaging%2Fblogic.git

CLK: clk-twl6040: fix return value check in twl6040_clk_probe()

In case of error, the function clk_register() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
---

diff --git a/drivers/clk/clk-twl6040.c b/drivers/clk/clk-twl6040.c
index f4a3389c3d09..bc1e713e7b9c 100644
--- a/drivers/clk/clk-twl6040.c
+++ b/drivers/clk/clk-twl6040.c
@@ -92,8 +92,8 @@ static int __devinit twl6040_clk_probe(struct platform_device *pdev)
 
 	clkdata->mcpdm_fclk.init = &wm831x_clkout_init;
 	clkdata->clk = clk_register(&pdev->dev, &clkdata->mcpdm_fclk);
-	if (!clkdata->clk)
-		return -EINVAL;
+	if (IS_ERR(clkdata->clk))
+		return PTR_ERR(clkdata->clk);
 
 	dev_set_drvdata(&pdev->dev, clkdata);