From f3ecc4ed6d29e5f1809129a3a8d0bb5c9622bcf6 Mon Sep 17 00:00:00 2001 From: Greg Dietsche Date: Mon, 6 Jun 2011 15:53:01 -0500 Subject: [PATCH] --- yaml --- r: 257507 b: refs/heads/master c: bca6b39979dfe0b2d14a3ca35e2930f5d9c8e3f5 h: refs/heads/master i: 257505: 0453caba99c315c7ef6c786c61c07ef3c71373e2 257503: 6d3bdc687daad6aaec9c32fc6a741ff8578eadec v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8940.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b63a904166b5..6a6398dd4681 100644 --- 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 index 25580e3ee7c4..056daa0010f9 100644 --- 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; }