Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
This commit is contained in:
Коммит
902a75cdc4
|
@ -3836,12 +3836,13 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
|
|||
ret);
|
||||
} else if (!(ret & WM1811_JACKDET_LVL)) {
|
||||
dev_dbg(codec->dev, "Ignoring removed jack\n");
|
||||
return IRQ_HANDLED;
|
||||
goto out;
|
||||
}
|
||||
} else if (!(reg & WM8958_MICD_STS)) {
|
||||
snd_soc_jack_report(wm8994->micdet[0].jack, 0,
|
||||
SND_JACK_MECHANICAL | SND_JACK_HEADSET |
|
||||
wm8994->btn_mask);
|
||||
wm8994->mic_detecting = true;
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче