diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 20:51:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-13 20:51:04 +0100 |
| commit | f98dedcefdbcbe8d51e77d911583ecc2c2668174 (patch) | |
| tree | 5bf81fe77322df0ca0c7e8c921302102f8700140 /sound/soc/codecs/wm8903.c | |
| parent | ASoC: Warn if WM8903 platform data is used to enable microphone IRQ (diff) | |
| parent | ASoC: Ensure supplies are maintained for force enabled widgets (diff) | |
| download | linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.tar.xz linux-f98dedcefdbcbe8d51e77d911583ecc2c2668174.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
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 f656a000b369..ae1cadfae84c 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1620,7 +1620,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, |