ASoC: samsung: Add proper error paths to s3c24xx I2S driver

s3c2412_i2s_probe() might fail so driver has to revert work done by
s3c_i2sv2_probe() (clock enabling).  Missing doing this would lead to
clock enable in-balance.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 3894bda06ebb67bab56c406d153060dc2bb25f24..58c3e9bfc6b7665f9c3bc108f291bba5f7c89479 100644 (file)
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -651,6 +651,15 @@ int s3c_i2sv2_probe(struct snd_soc_dai *dai,
 }
 EXPORT_SYMBOL_GPL(s3c_i2sv2_probe);
 
+void s3c_i2sv2_cleanup(struct snd_soc_dai *dai,
+                     struct s3c_i2sv2_info *i2s)
+{
+       clk_disable_unprepare(i2s->iis_pclk);
+       clk_put(i2s->iis_pclk);
+       i2s->iis_pclk = NULL;
+}
+EXPORT_SYMBOL_GPL(s3c_i2sv2_cleanup);
+
 #ifdef CONFIG_PM
 static int s3c2412_i2s_suspend(struct snd_soc_dai *dai)
 {

diff --git a/sound/soc/samsung/s3c-i2s-v2.h b/sound/soc/samsung/s3c-i2s-v2.h
index 182d80564e374b81fd2bbd86a159ebe1bfd137e1..3fca20f7a853da8708be4f95f7c48e1ce500b9ad 100644 (file)
--- a/sound/soc/samsung/s3c-i2s-v2.h
+++ b/sound/soc/samsung/s3c-i2s-v2.h
@@ -91,6 +91,13 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai,
                           struct s3c_i2sv2_info *i2s,
                           unsigned long base);
 
+/**
+ * s3c_i2sv2_cleanup - cleanup resources allocated in s3c_i2sv2_probe
+ * @dai: The ASoC DAI structure supplied to the original probe.
+ * @i2s: Our local i2s structure to fill in.
+ */
+extern void s3c_i2sv2_cleanup(struct snd_soc_dai *dai,
+                             struct s3c_i2sv2_info *i2s);
 /**
  * s3c_i2sv2_register_component - register component and dai with soc core
  * @dev: DAI device

diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index bcd1cbdeac93e80f00a9c09f22b804683a6a4419..cc0840fff5aae4a0f02d84e66b69d0b927f372c0 100644 (file)
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -65,7 +65,8 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
        s3c2412_i2s.iis_cclk = devm_clk_get(dai->dev, "i2sclk");
        if (IS_ERR(s3c2412_i2s.iis_cclk)) {
                pr_err("failed to get i2sclk clock\n");
-               return PTR_ERR(s3c2412_i2s.iis_cclk);
+               ret = PTR_ERR(s3c2412_i2s.iis_cclk);
+               goto err;
        }
 
        /* Set MPLL as the source for IIS CLK */
@@ -73,20 +74,24 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
        clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll"));
        ret = clk_prepare_enable(s3c2412_i2s.iis_cclk);
        if (ret)
-               return ret;
-
-       s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk;
+               goto err;
 
        /* Configure the I2S pins (GPE0...GPE4) in correct mode */
        s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
                              S3C_GPIO_PULL_NONE);
 
        return 0;
+
+err:
+       s3c_i2sv2_cleanup(dai, &s3c2412_i2s);
+
+       return ret;
 }
 
 static int s3c2412_i2s_remove(struct snd_soc_dai *dai)
 {
        clk_disable_unprepare(s3c2412_i2s.iis_cclk);
+       s3c_i2sv2_cleanup(dai, &s3c2412_i2s);
 
        return 0;
 }