ASoC: hisilicon: fix missing clk_disable_unprepare() on error in hi6210_i2s_startup()

[linux-2.6-microblaze.git] / sound / soc / hisilicon / hi6210-i2s.c

diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c
index 907f5f1..ff05b97 100644 (file)
--- a/sound/soc/hisilicon/hi6210-i2s.c
+++ b/sound/soc/hisilicon/hi6210-i2s.c
@@ -102,18 +102,15 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,
 
        for (n = 0; n < i2s->clocks; n++) {
                ret = clk_prepare_enable(i2s->clk[n]);
-               if (ret) {
-                       while (n--)
-                               clk_disable_unprepare(i2s->clk[n]);
-                       return ret;
-               }
+               if (ret)
+                       goto err_unprepare_clk;
        }
 
        ret = clk_set_rate(i2s->clk[CLK_I2S_BASE], 49152000);
        if (ret) {
                dev_err(i2s->dev, "%s: setting 49.152MHz base rate failed %d\n",
                        __func__, ret);
-               return ret;
+               goto err_unprepare_clk;
        }
 
        /* enable clock before frequency division */
@@ -165,6 +162,11 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,
        hi6210_write_reg(i2s, HII2S_SW_RST_N, val);
 
        return 0;
+
+err_unprepare_clk:
+       while (n--)
+               clk_disable_unprepare(i2s->clk[n]);
+       return ret;
 }
 
 static void hi6210_i2s_shutdown(struct snd_pcm_substream *substream,