aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-11-01 01:33:55 -0400
committerMike Turquette <mturquette@linaro.org>2012-11-15 14:04:34 -0500
commitddc07ef9499509200033be7e387feb6c83744a73 (patch)
tree71618b3abfc83c843dade2a33cf48d862cb153cb /drivers
parent5678596c7628e47e022d1d30fb2a6c9607f42a0e (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/clk-twl6040.c4
1 files changed, 2 insertions, 2 deletions
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)
92 92
93 clkdata->mcpdm_fclk.init = &wm831x_clkout_init; 93 clkdata->mcpdm_fclk.init = &wm831x_clkout_init;
94 clkdata->clk = clk_register(&pdev->dev, &clkdata->mcpdm_fclk); 94 clkdata->clk = clk_register(&pdev->dev, &clkdata->mcpdm_fclk);
95 if (!clkdata->clk) 95 if (IS_ERR(clkdata->clk))
96 return -EINVAL; 96 return PTR_ERR(clkdata->clk);
97 97
98 dev_set_drvdata(&pdev->dev, clkdata); 98 dev_set_drvdata(&pdev->dev, clkdata);
99 99