Skip to content

L
linux
Commit 588701ef authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents ffdcb88b 2df7c6aa
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
sound/soc/codecs/max98090.c
View file @ 588701ef
...@@ -2084,7 +2084,8 @@ static irqreturn_t max98090_interrupt(int irq, void *data) ...@@ -2084,7 +2084,8 @@ 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,
&max98090->jack_work,
msecs_to_jiffies(100)); msecs_to_jiffies(100));
} }
...@@ -2132,7 +2133,8 @@ int max98090_mic_detect(struct snd_soc_codec *codec, ...@@ -2132,7 +2133,8 @@ 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,
&max98090->jack_work,
msecs_to_jiffies(100)); msecs_to_jiffies(100));
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7