Merge branch 'topic/workq-update' into topic/misc

2 files changed, 6 insertions, 8 deletions

diff --git a/sound/aoa/core/gpio-feature.c b/sound/aoa/core/gpio-feature.c
index de8e03afa97..faa31749054 100644
--- a/sound/aoa/core/gpio-feature.c
+++ b/sound/aoa/core/gpio-feature.c
@@ -287,10 +287,9 @@ static void ftr_gpio_exit(struct gpio_runtime *rt)
                 free_irq(linein_detect_irq, &rt->line_in_notify);
         if (rt->line_out_notify.gpio_private)
                 free_irq(lineout_detect_irq, &rt->line_out_notify);
-        cancel_delayed_work(&rt->headphone_notify.work);
-        cancel_delayed_work(&rt->line_in_notify.work);
-        cancel_delayed_work(&rt->line_out_notify.work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&rt->headphone_notify.work);
+        cancel_delayed_work_sync(&rt->line_in_notify.work);
+        cancel_delayed_work_sync(&rt->line_out_notify.work);
         mutex_destroy(&rt->headphone_notify.mutex);
         mutex_destroy(&rt->line_in_notify.mutex);
         mutex_destroy(&rt->line_out_notify.mutex);
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 7e267c9379b..c8d8a1a6f96 100644
--- a/sound/aoa/core/gpio-pmf.c
+++ b/sound/aoa/core/gpio-pmf.c
@@ -107,10 +107,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
 
         /* make sure no work is pending before freeing
          * all things */
-        cancel_delayed_work(&rt->headphone_notify.work);
-        cancel_delayed_work(&rt->line_in_notify.work);
-        cancel_delayed_work(&rt->line_out_notify.work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&rt->headphone_notify.work);
+        cancel_delayed_work_sync(&rt->line_in_notify.work);
+        cancel_delayed_work_sync(&rt->line_out_notify.work);
 
         mutex_destroy(&rt->headphone_notify.mutex);
         mutex_destroy(&rt->line_in_notify.mutex);