Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...

1 files changed, 3 insertions, 4 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);