aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-dev.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-30 07:43:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:47 -0400
commitd56dc61265d2527a63ab5b0f03199a43cd89ca36 (patch)
treebea2a5b12fc120ca6e8797b2f16ad9696e0f25dd /drivers/media/video/v4l2-dev.c
parent95f73c5b57990c97047c200b8746ab62a360c5bc (diff)
V4L/DVB (8613): v4l: move BKL down to the driver level.
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-dev.c')
-rw-r--r--drivers/media/video/v4l2-dev.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 155fdec9ac7d..6b9f3cb0de98 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -116,7 +116,6 @@ static int video_open(struct inode *inode, struct file *file)
116 116
117 if (minor >= VIDEO_NUM_DEVICES) 117 if (minor >= VIDEO_NUM_DEVICES)
118 return -ENODEV; 118 return -ENODEV;
119 lock_kernel();
120 mutex_lock(&videodev_lock); 119 mutex_lock(&videodev_lock);
121 vfl = video_device[minor]; 120 vfl = video_device[minor];
122 if (vfl == NULL) { 121 if (vfl == NULL) {
@@ -126,7 +125,6 @@ static int video_open(struct inode *inode, struct file *file)
126 vfl = video_device[minor]; 125 vfl = video_device[minor];
127 if (vfl == NULL) { 126 if (vfl == NULL) {
128 mutex_unlock(&videodev_lock); 127 mutex_unlock(&videodev_lock);
129 unlock_kernel();
130 return -ENODEV; 128 return -ENODEV;
131 } 129 }
132 } 130 }
@@ -140,7 +138,6 @@ static int video_open(struct inode *inode, struct file *file)
140 } 138 }
141 fops_put(old_fops); 139 fops_put(old_fops);
142 mutex_unlock(&videodev_lock); 140 mutex_unlock(&videodev_lock);
143 unlock_kernel();
144 return err; 141 return err;
145} 142}
146 143