diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-26 11:27:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-26 11:27:47 +0100 |
| commit | 11be6a269d2ad3e94c0597f21786092b8340a822 (patch) | |
| tree | a1b244c74f210750d0bb7a6af03332d7ccbfacbd /sound/soc/codecs/wm8903.c | |
| parent | 4dfb8a45d533808e78d67ef27e0a47d456c12a92 (diff) | |
| parent | 43c63188821dc21b2af23a40a18faea6e386e90a (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 987476a5895f..017d99ceb42e 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1482,7 +1482,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, WM8903_MICDET_EINT | WM8903_MICSHRT_EINT, irq_mask); - if (det && shrt) { + if (det || shrt) { /* Enable mic detection, this may not have been set through * platform data (eg, if the defaults are OK). */ snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0, |