Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

[net-next-2.6.git] / sound / sound_core.c

diff --git a/sound/sound_core.c b/sound/sound_core.c
index c8627fcd49007a8285fc6e506db54564ee35f29d..cb61317df509690fd597cb0385647af63d5a0e06 100644 (file)
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -629,12 +629,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);