1 files changed, 2 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 25580e3ee7c..d40da04db37 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -297,8 +297,6 @@ static int wm8940_add_widgets(struct snd_soc_codec *codec)
         if (ret)
                 goto error_ret;
         ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-        if (ret)
-                goto error_ret;
 
 error_ret:
         return ret;
@@ -472,6 +470,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
                 break;
         }
 
+        codec->dapm.bias_level = level;
+
         return ret;
 }
 
@@ -683,8 +683,6 @@ static int wm8940_resume(struct snd_soc_codec *codec)
                 }
         }
         ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-        if (ret)
-                goto error_ret;
 
 error_ret:
         return ret;
@@ -730,9 +728,6 @@ static int wm8940_probe(struct snd_soc_codec *codec)
         if (ret)
                 return ret;
         ret = wm8940_add_widgets(codec);
-        if (ret)
-                return ret;
-
         return ret;
 }