From c8b5c505811fd4797e0ea35bcc60478d626a0971 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 30 Jul 2008 13:43:36 +0200
Subject: v4l: move BKL down to the driver level.
From: Hans Verkuil <hverkuil@xs4all.nl>
The BKL is now moved from the video_open function in v4l2-dev.c to the
various drivers. It seems about a third of the drivers already has a
lock of some sort protecting the open(), another third uses
video_exclusive_open (yuck!) and the last third required adding the
BKL in their open function.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
linux/drivers/media/video/v4l2-dev.c | 3 ---
1 file changed, 3 deletions(-)
(limited to 'linux/drivers/media/video/v4l2-dev.c')
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c
index d7aa8f6a4..c3d3212fd 100644
--- a/linux/drivers/media/video/v4l2-dev.c
+++ b/linux/drivers/media/video/v4l2-dev.c
@@ -150,7 +150,6 @@ static int video_open(struct inode *inode, struct file *file)
if (minor >= VIDEO_NUM_DEVICES)
return -ENODEV;
- lock_kernel();
mutex_lock(&videodev_lock);
vfl = video_device[minor];
if (vfl == NULL) {
@@ -160,7 +159,6 @@ static int video_open(struct inode *inode, struct file *file)
vfl = video_device[minor];
if (vfl == NULL) {
mutex_unlock(&videodev_lock);
- unlock_kernel();
return -ENODEV;
}
}
@@ -178,7 +176,6 @@ static int video_open(struct inode *inode, struct file *file)
}
fops_put(old_fops);
mutex_unlock(&videodev_lock);
- unlock_kernel();
return err;
}
--
cgit v1.2.3