diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-10 05:28:51 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-10 05:28:51 -0400 |
commit | 902a75cdc491066514aac35b40a756aaa9740173 (patch) | |
tree | 0d7d1b5a6fc578c67fdbc47fa230836f9d765668 /sound | |
parent | 4351ac5b9fb5df2f669c7bfba08c957fc201b150 (diff) | |
parent | 7afce3f5e56e9cb97cf1f35832bf8e8dde08cc45 (diff) |
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index dfd997aaadfc..29e95f93d482 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -3836,12 +3836,13 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) | |||
3836 | ret); | 3836 | ret); |
3837 | } else if (!(ret & WM1811_JACKDET_LVL)) { | 3837 | } else if (!(ret & WM1811_JACKDET_LVL)) { |
3838 | dev_dbg(codec->dev, "Ignoring removed jack\n"); | 3838 | dev_dbg(codec->dev, "Ignoring removed jack\n"); |
3839 | return IRQ_HANDLED; | 3839 | goto out; |
3840 | } | 3840 | } |
3841 | } else if (!(reg & WM8958_MICD_STS)) { | 3841 | } else if (!(reg & WM8958_MICD_STS)) { |
3842 | snd_soc_jack_report(wm8994->micdet[0].jack, 0, | 3842 | snd_soc_jack_report(wm8994->micdet[0].jack, 0, |
3843 | SND_JACK_MECHANICAL | SND_JACK_HEADSET | | 3843 | SND_JACK_MECHANICAL | SND_JACK_HEADSET | |
3844 | wm8994->btn_mask); | 3844 | wm8994->btn_mask); |
3845 | wm8994->mic_detecting = true; | ||
3845 | goto out; | 3846 | goto out; |
3846 | } | 3847 | } |
3847 | 3848 | ||