summaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
authorRichard Holden <aciddeath@gmail.com>2008-10-19 05:27:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-20 17:52:36 +0200
commit60c11d2abf4ef811d0ce3ea34279746729c4c6fc (patch)
tree0e39f8a212461beb7195e46f7a727c9e820bbc2c /drivers/telephony
parentfb: convert lock/unlock_kernel() into local fb mutex (diff)
downloadlinux-60c11d2abf4ef811d0ce3ea34279746729c4c6fc.tar.xz
linux-60c11d2abf4ef811d0ce3ea34279746729c4c6fc.zip
phonedev: remove BKL
The phone_device array is covered by the phone_lock mutex in all cases and request_module no longer needs the BKL so we can remove the only remaining instance of the BKL from phonedev. Signed-off-by: Richard Holden <aciddeath@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/telephony')
-rw-r--r--drivers/telephony/phonedev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c
index 4d74ba36c3a1..37caf4d69037 100644
--- a/drivers/telephony/phonedev.c
+++ b/drivers/telephony/phonedev.c
@@ -54,7 +54,6 @@ static int phone_open(struct inode *inode, struct file *file)
if (minor >= PHONE_NUM_DEVICES)
return -ENODEV;
- lock_kernel();
mutex_lock(&phone_lock);
p = phone_device[minor];
if (p)
@@ -81,7 +80,6 @@ static int phone_open(struct inode *inode, struct file *file)
fops_put(old_fops);
end:
mutex_unlock(&phone_lock);
- unlock_kernel();
return err;
}