2 files changed, 14 insertions, 3 deletions

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 6ddee999bc51..64637d1cf4e5 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1879,7 +1879,7 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
         ret = snd_soc_add_codec_controls(codec,
                                          arizona_adsp2_rate_controls, 1);
         if (ret)
-                return ret;
+                goto err_adsp2_codec_probe;
 
         arizona_init_spk(codec);
         arizona_init_gpio(codec);
@@ -1889,6 +1889,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
         priv->core.arizona->dapm = dapm;
 
         return 0;
+
+err_adsp2_codec_probe:
+        wm_adsp2_codec_remove(&priv->core.adsp[0], codec);
+
+        return ret;
 }
 
 static int wm5102_codec_remove(struct snd_soc_codec *codec)
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 05aa5bca97cf..2d1168c768d9 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1607,18 +1607,24 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
         for (i = 0; i < WM5110_NUM_ADSP; ++i) {
                 ret = wm_adsp2_codec_probe(&priv->core.adsp[i], codec);
                 if (ret)
-                        return ret;
+                        goto err_adsp2_codec_probe;
         }
 
         ret = snd_soc_add_codec_controls(codec,
                                          arizona_adsp2_rate_controls,
                                          WM5110_NUM_ADSP);
         if (ret)
-                return ret;
+                goto err_adsp2_codec_probe;
 
         snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 
         return 0;
+
+err_adsp2_codec_probe:
+        for (--i; i >= 0; --i)
+                wm_adsp2_codec_remove(&priv->core.adsp[i], codec);
+
+        return ret;
 }
 
 static int wm5110_codec_remove(struct snd_soc_codec *codec)