summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2012-05-28 11:14:33 +0200
committerTakashi Iwai <tiwai@suse.de>2012-06-25 11:14:13 +0200
commit6cab3e1e65bfe070f09bb091eeda182b171d5929 (patch)
treed9016ccb514e7e00f81534c5ff2d7f1f40c6b77f
parent74953e201001b9582bf3125858cf6955650edb48 (diff)
downloadlinux-3.10-6cab3e1e65bfe070f09bb091eeda182b171d5929.tar.gz
linux-3.10-6cab3e1e65bfe070f09bb091eeda182b171d5929.tar.bz2
linux-3.10-6cab3e1e65bfe070f09bb091eeda182b171d5929.zip
ASoC: wm8994: remove duplicate code
It seems that the code duplication was added at a merge operation. Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/soc/codecs/wm8994.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index aa8c98b628d..1436b6ce74d 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -727,9 +727,6 @@ static void wm1811_jackdet_set_mode(struct snd_soc_codec *codec, u16 mode)
if (!wm8994->jackdet || !wm8994->jack_cb)
return;
- if (!wm8994->jackdet || !wm8994->jack_cb)
- return;
-
if (wm8994->active_refcount)
mode = WM1811_JACKDET_MODE_AUDIO;