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

049d4140 · Mark Brown · 8ef2292e · a14d9829 · 049d4140
Commit 049d4140 authored Aug 22, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

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

No files found.
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -363,7 +363,8 @@ static void sta32x_watchdog(struct work_struct *work)
 	}
 	if (!sta32x->shutdown)
-		schedule_delayed_work(&sta32x->watchdog_work,
+		queue_delayed_work(system_power_efficient_wq,
+				   &sta32x->watchdog_work,
 				   round_jiffies_relative(HZ));
 }
@@ -371,7 +372,8 @@ static void sta32x_watchdog_start(struct sta32x_priv *sta32x)
 {
 	if (sta32x->pdata->needs_esd_watchdog) {
 		sta32x->shutdown = 0;
-		schedule_delayed_work(&sta32x->watchdog_work,
+		queue_delayed_work(system_power_efficient_wq,
+				   &sta32x->watchdog_work,
 				   round_jiffies_relative(HZ));
 	}
 }