aboutsummaryrefslogtreecommitdiff
path: root/sound/sound_core.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-07-11 12:16:36 +0200
committerTakashi Iwai <tiwai@suse.de>2010-07-12 17:41:05 +0200
commit90dc763fef4c869e60b2a7ad92e1a7dab68575ea (patch)
treeab3757f14a6d84e36afa36ac5f325fd316d4e197 /sound/sound_core.c
parent395c61d19621e80b763810cc988416dc1b6bfd3e (diff)
downloadlinux-linaro-90dc763fef4c869e60b2a7ad92e1a7dab68575ea.tar.gz
sound: push BKL into open functions
This moves the lock_kernel() call from soundcore_open to the individual OSS device drivers, where we can deal with it one driver at a time if needed, or just kill off the drivers. All core components in ALSA already provide adequate locking in their open()-functions and do not require the big kernel lock, so there is no need to add the BKL there. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sound_core.c')
-rw-r--r--sound/sound_core.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index c8627fcd490..cb61317df50 100644
--- 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);