Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38

1 files changed, 4 insertions, 2 deletions

diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index e5ebe56fb0c5..969605fbcb7f 100644
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -557,7 +557,8 @@ static void oxygen_card_free(struct snd_card *card)
         oxygen_shutdown(chip);
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
-        flush_scheduled_work();
+        flush_work_sync(&chip->spdif_input_bits_work);
+        flush_work_sync(&chip->gpio_work);
         chip->model.cleanup(chip);
         kfree(chip->model_data);
         mutex_destroy(&chip->mutex);
@@ -733,7 +734,8 @@ int oxygen_pci_suspend(struct pci_dev *pci, pm_message_t state)
         spin_unlock_irq(&chip->reg_lock);
 
         synchronize_irq(chip->irq);
-        flush_scheduled_work();
+        flush_work_sync(&chip->spdif_input_bits_work);
+        flush_work_sync(&chip->gpio_work);
         chip->interrupt_mask = saved_interrupt_mask;
 
         pci_disable_device(pci);