summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/meye.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-30 13:43:36 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-07-30 13:43:36 +0200
commitc8b5c505811fd4797e0ea35bcc60478d626a0971 (patch)
tree628f97e562257d3dc6c18269b3a520c45873de7d /linux/drivers/media/video/meye.c
parent4381ceef6895b12019f4d55a6f5ff9629194b259 (diff)
downloadmediapointer-dvb-s2-c8b5c505811fd4797e0ea35bcc60478d626a0971.tar.gz
mediapointer-dvb-s2-c8b5c505811fd4797e0ea35bcc60478d626a0971.tar.bz2
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>
Diffstat (limited to 'linux/drivers/media/video/meye.c')
-rw-r--r--linux/drivers/media/video/meye.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c
index d128a611e..a0cdae0c1 100644
--- a/linux/drivers/media/video/meye.c
+++ b/linux/drivers/media/video/meye.c
@@ -850,15 +850,19 @@ static int meye_open(struct inode *inode, struct file *file)
{
int i, err;
+ lock_kernel();
err = video_exclusive_open(inode, file);
- if (err < 0)
+ if (err < 0) {
+ unlock_kernel();
return err;
+ }
mchip_hic_stop();
if (mchip_dma_alloc()) {
printk(KERN_ERR "meye: mchip framebuffer allocation failed\n");
video_exclusive_release(inode, file);
+ unlock_kernel();
return -ENOBUFS;
}
@@ -866,6 +870,7 @@ static int meye_open(struct inode *inode, struct file *file)
meye.grab_buffer[i].state = MEYE_BUF_UNUSED;
kfifo_reset(meye.grabq);
kfifo_reset(meye.doneq);
+ unlock_kernel();
return 0;
}