x86/PCI: use host bridge _CRS info on MSI MS-7253

[linux-flexiantxendom0.git] / sound / sound_core.c

diff --git a/sound/sound_core.c b/sound/sound_core.c
index c8627fc..6ce2778 100644 (file)
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -104,7 +104,6 @@ module_exit(cleanup_soundcore);
 
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sound.h>
@@ -165,6 +164,7 @@ static const struct file_operations soundcore_fops =
        /* We must have an owner or the module locking fails */
        .owner  = THIS_MODULE,
        .open   = soundcore_open,
+       .llseek = noop_llseek,
 };
 
 /*
@@ -384,6 +384,9 @@ int register_sound_special_device(const struct file_operations *fops, int unit,
            case 4:
                name = "audio";
                break;
+           case 5:
+               name = "dspW";
+               break;
            case 8:
                name = "sequencer2";
                if (unit >= SOUND_STEP)
@@ -629,12 +632,8 @@ static int soundcore_open(struct inode *inode, struct file *file)
                file->f_op = new_fops;
                spin_unlock(&sound_loader_lock);
 
-               if (file->f_op->open) {
-                       /* TODO: push down BKL into indivial open functions */
-                       lock_kernel();
+               if (file->f_op->open)
                        err = file->f_op->open(inode,file);
-                       unlock_kernel();
-               }
 
                if (err) {
                        fops_put(file->f_op);