---

yaml --- r: 257507 b: refs/heads/master c: bca6b39 h: refs/heads/master i: 257505: 0453cab 257503: 6d3bdc6 v: v3
git-mirror · Jun 7, 2011 · f3ecc4e · f3ecc4e
1 parent b8c555f
commit f3ecc4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46758dee727348d3648c83445d10ded321376543
+refs/heads/master: bca6b39979dfe0b2d14a3ca35e2930f5d9c8e3f5
diff --git a/trunk/sound/soc/codecs/wm8940.c b/trunk/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;
@@ -683,8 +681,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 +726,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;
 }