OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74953e2
)
ASoC: wm8994: remove duplicate code
author
Jaroslav Kysela
<perex@perex.cz>
Mon, 28 May 2012 09:14:33 +0000
(11:14 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Mon, 25 Jun 2012 09:14:13 +0000
(11:14 +0200)
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>
sound/soc/codecs/wm8994.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm8994.c
b/sound/soc/codecs/wm8994.c
index
aa8c98b
..
1436b6c
100644
(file)
--- 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;