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

588701ef · Mark Brown · ffdcb88b · 2df7c6aa · 588701ef
Commit 588701ef authored Aug 22, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

sound/soc/codecs/max98090.c sound/soc/codecs/max98090.c +6 -4

No files found.
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2084,8 +2084,9 @@ 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,
-			msecs_to_jiffies(100));
+				   &max98090->jack_work,
+				   msecs_to_jiffies(100));
 	}
 	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_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;
 }