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

1 files changed, 6 insertions, 4 deletions

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index cfb55fe35e98..06edb396e733 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -363,16 +363,18 @@ static void sta32x_watchdog(struct work_struct *work)
         }
 
         if (!sta32x->shutdown)
-                schedule_delayed_work(&sta32x->watchdog_work,
-                                      round_jiffies_relative(HZ));
+                queue_delayed_work(system_power_efficient_wq,
+                                   &sta32x->watchdog_work,
+                                   round_jiffies_relative(HZ));
 }
 
 static void sta32x_watchdog_start(struct sta32x_priv *sta32x)
 {
         if (sta32x->pdata->needs_esd_watchdog) {
                 sta32x->shutdown = 0;
-                schedule_delayed_work(&sta32x->watchdog_work,
-                                      round_jiffies_relative(HZ));
+                queue_delayed_work(system_power_efficient_wq,
+                                   &sta32x->watchdog_work,
+                                   round_jiffies_relative(HZ));
         }
 }