From 82b08c5ad7ce5dfcf8438ab4f8926b366f8cec7a Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 24 Sep 2012 13:38:03 -0700 Subject: [PATCH] --- yaml --- r: 336477 b: refs/heads/master c: 980f58a45e04b248e9dd01b0eba510a3384160db h: refs/heads/master i: 336475: ff1268eb782eaee1f031bcb63b5ae36238532507 v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-wm831x.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 96dd6583b7e1..d33be6848715 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcd6f569e87471d7f104bd9497f0b516a3b12e32 +refs/heads/master: 980f58a45e04b248e9dd01b0eba510a3384160db diff --git a/trunk/drivers/clk/clk-wm831x.c b/trunk/drivers/clk/clk-wm831x.c index e7b7765e85f3..eb1afafca037 100644 --- a/trunk/drivers/clk/clk-wm831x.c +++ b/trunk/drivers/clk/clk-wm831x.c @@ -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; }