diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-07-11 06:16:36 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-07-12 11:41:05 -0400 |
commit | 90dc763fef4c869e60b2a7ad92e1a7dab68575ea (patch) | |
tree | ab3757f14a6d84e36afa36ac5f325fd316d4e197 /sound/sound_core.c | |
parent | 395c61d19621e80b763810cc988416dc1b6bfd3e (diff) |
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.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c index c8627fcd4900..cb61317df509 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) | |||
629 | file->f_op = new_fops; | 629 | file->f_op = new_fops; |
630 | spin_unlock(&sound_loader_lock); | 630 | spin_unlock(&sound_loader_lock); |
631 | 631 | ||
632 | if (file->f_op->open) { | 632 | if (file->f_op->open) |
633 | /* TODO: push down BKL into indivial open functions */ | ||
634 | lock_kernel(); | ||
635 | err = file->f_op->open(inode,file); | 633 | err = file->f_op->open(inode,file); |
636 | unlock_kernel(); | ||
637 | } | ||
638 | 634 | ||
639 | if (err) { | 635 | if (err) { |
640 | fops_put(file->f_op); | 636 | fops_put(file->f_op); |