]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ASoC: playpaq_wm8510: Return proper error if clk_get fails
authorAxel Lin <axel.lin@gmail.com>
Fri, 9 Sep 2011 02:15:37 +0000 (10:15 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 9 Sep 2011 16:42:00 +0000 (09:42 -0700)
Return proper error instead of 0 if clk_get fails.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/atmel/playpaq_wm8510.c

index 1aac2f4dbcf61b84b4700c5179b03e8bee995f54..2909bfaed265b5d1778cda8141ca3539f122a37b 100644 (file)
@@ -383,14 +383,17 @@ static int __init playpaq_asoc_init(void)
        _gclk0 = clk_get(NULL, "gclk0");
        if (IS_ERR(_gclk0)) {
                _gclk0 = NULL;
+               ret = PTR_ERR(_gclk0);
                goto err_gclk0;
        }
        _pll0 = clk_get(NULL, "pll0");
        if (IS_ERR(_pll0)) {
                _pll0 = NULL;
+               ret = PTR_ERR(_pll0);
                goto err_pll0;
        }
-       if (clk_set_parent(_gclk0, _pll0)) {
+       ret = clk_set_parent(_gclk0, _pll0);
+       if (ret) {
                pr_warning("snd-soc-playpaq: "
                           "Failed to set PLL0 as parent for DAC clock\n");
                goto err_set_clk;