Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6-omap-h63xx.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 48d38a79cbbba41d51b22b1c6487714348833749..e3338d6071efb993ae9370bf634fdf28ebb27e42 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/file.h>
@@ -340,8 +339,8 @@ int snd_card_disconnect(struct snd_card *card)
                list_add(&mfile->shutdown_list, &shutdown_files);
                spin_unlock(&shutdown_lock);
 
-               fops_get(&snd_shutdown_f_ops);
                mfile->file->f_op = &snd_shutdown_f_ops;
+               fops_get(mfile->file->f_op);
                
                mfile = mfile->next;
        }