Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next (588701ef) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/max98090.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -2084,7 +2084,8 @@ static irqreturn_t max98090_interrupt(int irq, void *data)

		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));
		}

		@@ -2132,7 +2133,8 @@ int max98090_mic_detect(struct snd_soc_codec *codec,
		snd_soc_jack_report(max98090->jack, 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));

		return 0;