clk: wm831x: Fix clk_register() error code checking
authorStephen Boyd <sboyd@codeaurora.org>
Mon, 24 Sep 2012 20:38:03 +0000 (13:38 -0700)
committerMike Turquette <mturquette@linaro.org>
Mon, 29 Oct 2012 18:12:33 +0000 (11:12 -0700)
clk_register() returns an ERR_PTR upon failure, not NULL. Fix
these error paths.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
drivers/clk/clk-wm831x.c

index e7b7765e85f37dd96d3ba2eab66e74ef396906d2..eb1afafca037d62ae5e4f571d419ddd99df72b0c 100644 (file)
@@ -371,20 +371,20 @@ static __devinit int wm831x_clk_probe(struct platform_device *pdev)
 
        clkdata->xtal_hw.init = &wm831x_xtal_init;
        clkdata->xtal = clk_register(&pdev->dev, &clkdata->xtal_hw);
-       if (!clkdata->xtal)
-               return -EINVAL;
+       if (IS_ERR(clkdata->xtal))
+               return PTR_ERR(clkdata->xtal);
 
        clkdata->fll_hw.init = &wm831x_fll_init;
        clkdata->fll = clk_register(&pdev->dev, &clkdata->fll_hw);
-       if (!clkdata->fll) {
-               ret = -EINVAL;
+       if (IS_ERR(clkdata->fll)) {
+               ret = PTR_ERR(clkdata->fll);
                goto err_xtal;
        }
 
        clkdata->clkout_hw.init = &wm831x_clkout_init;
        clkdata->clkout = clk_register(&pdev->dev, &clkdata->clkout_hw);
-       if (!clkdata->clkout) {
-               ret = -EINVAL;
+       if (IS_ERR(clkdata->clkout)) {
+               ret = PTR_ERR(clkdata->clkout);
                goto err_fll;
        }