p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next

This commit is contained in:
Mark Brown 2013-08-22 14:28:41 +01:00
parent ffdcb88b80 2df7c6aad6
commit 588701efbd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/max98090.c
View File

@ -2084,8 +2084,9 @@ static irqreturn_t max98090_interrupt(int irq, void *data)
pm_wakeup_event(codec->dev, 100); pm_wakeup_event(codec->dev, 100);
schedule_delayed_work(&max98090->jack_work, queue_delayed_work(system_power_efficient_wq,
msecs_to_jiffies(100)); &max98090->jack_work,
msecs_to_jiffies(100));
} }
if (active & M98090_DRCACT_MASK) if (active & M98090_DRCACT_MASK)
@ -2132,8 +2133,9 @@ int max98090_mic_detect(struct snd_soc_codec *codec,
snd_soc_jack_report(max98090->jack, 0, snd_soc_jack_report(max98090->jack, 0,
SND_JACK_HEADSET | SND_JACK_BTN_0); SND_JACK_HEADSET | SND_JACK_BTN_0);
schedule_delayed_work(&max98090->jack_work, queue_delayed_work(system_power_efficient_wq,
msecs_to_jiffies(100)); &max98090->jack_work,
msecs_to_jiffies(100));
return 0; return 0;
} }