Merge tag 'asoc-v3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.18

A few small fixes, mostly small although a few really nasty ones like
the interaction between GPIO 0 and simple-card.

8 files changed, 36 insertions, 23 deletions

diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index 4c3b0af39fd8..e88a6b67f781 100644
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -146,7 +146,7 @@ struct pm860x_priv {
         struct pm860x_det       det;
 
         int                     irq[4];
-        unsigned char           name[4][MAX_NAME_LEN];
+        unsigned char           name[4][MAX_NAME_LEN+1];
 };
 
 /* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index 388f90a597fa..71f775aad7c7 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -765,12 +765,18 @@ static int __init mc13783_codec_probe(struct platform_device *pdev)
                         return -ENOSYS;
 
                 ret = of_property_read_u32(np, "adc-port", &priv->adc_ssi_port);
-                if (ret)
-                        goto out;
+                if (ret) {
+                        of_node_put(np);
+                        return ret;
+                }
 
                 ret = of_property_read_u32(np, "dac-port", &priv->dac_ssi_port);
-                if (ret)
-                        goto out;
+                if (ret) {
+                        of_node_put(np);
+                        return ret;
+                }
+
+                of_node_put(np);
         }
 
         dev_set_drvdata(&pdev->dev, priv);
@@ -783,8 +789,6 @@ static int __init mc13783_codec_probe(struct platform_device *pdev)
                 ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_mc13783,
                         mc13783_dai_async, ARRAY_SIZE(mc13783_dai_async));
 
-out:
-        of_node_put(np);
         return ret;
 }
 
diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c
index 653e66d150c8..f8cf10e16ce9 100644
--- a/sound/soc/fsl/imx-es8328.c
+++ b/sound/soc/fsl/imx-es8328.c
@@ -78,7 +78,7 @@ static const struct snd_soc_dapm_widget imx_es8328_dapm_widgets[] = {
 static int imx_es8328_probe(struct platform_device *pdev)
 {
         struct device_node *np = pdev->dev.of_node;
-        struct device_node *ssi_np, *codec_np;
+        struct device_node *ssi_np = NULL, *codec_np = NULL;
         struct platform_device *ssi_pdev;
         struct imx_es8328_data *data;
         u32 int_port, ext_port;
@@ -104,6 +104,7 @@ static int imx_es8328_probe(struct platform_device *pdev)
         if (ext_port > MUX_PORT_MAX || ext_port == 0) {
                 dev_err(dev, "mux-ext-port: hardware only has %d mux ports\n",
                         MUX_PORT_MAX);
+                ret = -EINVAL;
                 goto fail;
         }
 
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index fcb431fe20b4..d1b7293c133e 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -501,6 +501,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
         priv->snd_card.dai_link = dai_link;
         priv->snd_card.num_links = num_links;
 
+        priv->gpio_hp_det = -ENOENT;
+        priv->gpio_mic_det = -ENOENT;
+
         /* Get room for the other properties */
         priv->dai_props = devm_kzalloc(dev,
                         sizeof(*priv->dai_props) * num_links,
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 033487c9a164..f373e37f8305 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -108,8 +108,10 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on)
                         while (val) {
                                 regmap_read(i2s->regmap, I2S_CLR, &val);
                                 retry--;
-                                if (!retry)
+                                if (!retry) {
                                         dev_warn(i2s->dev, "fail to clear\n");
+                                        break;
+                                }
                         }
                 }
         }
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3d8cff629a18..4c8f8a23a0e9 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4192,10 +4192,10 @@ void snd_soc_remove_platform(struct snd_soc_platform *platform)
         snd_soc_component_del_unlocked(&platform->component);
         mutex_unlock(&client_mutex);
 
-        snd_soc_component_cleanup(&platform->component);
-
         dev_dbg(platform->dev, "ASoC: Unregistered platform '%s'\n",
                 platform->component.name);
+
+        snd_soc_component_cleanup(&platform->component);
 }
 EXPORT_SYMBOL_GPL(snd_soc_remove_platform);
 
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2c456a376ade..c61cb9cedbcd 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -592,9 +592,9 @@ static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w,
         int shared;
         struct snd_kcontrol *kcontrol;
         bool wname_in_long_name, kcname_in_long_name;
-        char *long_name;
+        char *long_name = NULL;
         const char *name;
-        int ret;
+        int ret = 0;
 
         prefix = soc_dapm_prefix(dapm);
         if (prefix)
@@ -653,15 +653,17 @@ static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w,
 
                 kcontrol = snd_soc_cnew(&w->kcontrol_news[kci], NULL, name,
                                         prefix);
-                kfree(long_name);
-                if (!kcontrol)
-                        return -ENOMEM;
+                if (!kcontrol) {
+                        ret = -ENOMEM;
+                        goto exit_free;
+                }
+
                 kcontrol->private_free = dapm_kcontrol_free;
 
                 ret = dapm_kcontrol_data_alloc(w, kcontrol);
                 if (ret) {
                         snd_ctl_free_one(kcontrol);
-                        return ret;
+                        goto exit_free;
                 }
 
                 ret = snd_ctl_add(card, kcontrol);
@@ -669,17 +671,18 @@ static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w,
                         dev_err(dapm->dev,
                                 "ASoC: failed to add widget %s dapm kcontrol %s: %d\n",
                                 w->name, name, ret);
-                        return ret;
+                        goto exit_free;
                 }
         }
 
         ret = dapm_kcontrol_add_widget(kcontrol, w);
-        if (ret)
-                return ret;
+        if (ret == 0)
+                w->kcontrols[kci] = kcontrol;
 
-        w->kcontrols[kci] = kcontrol;
+exit_free:
+        kfree(long_name);
 
-        return 0;
+        return ret;
 }
 
 /* create new dapm mixer control */
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 642c86240752..002311afdeaa 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream)
         } else {
                 for (i = 0; i < rtd->num_codecs; i++) {
                         codec_dai = rtd->codec_dais[i];
-                        if (codec_dai->driver->playback.sig_bits == 0) {
+                        if (codec_dai->driver->capture.sig_bits == 0) {
                                 bits = 0;
                                 break;
                         }