diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 13:43:36 +0200 |
---|---|---|
committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-30 13:43:36 +0200 |
commit | c8b5c505811fd4797e0ea35bcc60478d626a0971 (patch) | |
tree | 628f97e562257d3dc6c18269b3a520c45873de7d /linux/drivers/media/video/cx23885/cx23885-video.c | |
parent | 4381ceef6895b12019f4d55a6f5ff9629194b259 (diff) | |
download | mediapointer-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/cx23885/cx23885-video.c')
-rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-video.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-video.c b/linux/drivers/media/video/cx23885/cx23885-video.c index 3f1765de0..98a7dc1c0 100644 --- a/linux/drivers/media/video/cx23885/cx23885-video.c +++ b/linux/drivers/media/video/cx23885/cx23885-video.c @@ -787,6 +787,7 @@ static int video_open(struct inode *inode, struct file *file) enum v4l2_buf_type type = 0; int radio = 0; + lock_kernel(); list_for_each(list, &cx23885_devlist) { h = list_entry(list, struct cx23885_dev, devlist); if (h->video_dev->minor == minor) { @@ -804,16 +805,20 @@ static int video_open(struct inode *inode, struct file *file) dev = h; } } - if (NULL == dev) + if (NULL == dev) { + unlock_kernel(); return -ENODEV; + } dprintk(1, "open minor=%d radio=%d type=%s\n", minor, radio, v4l2_type_names[type]); /* allocate + initialize per filehandle data */ fh = kzalloc(sizeof(*fh), GFP_KERNEL); - if (NULL == fh) + if (NULL == fh) { + unlock_kernel(); return -ENOMEM; + } file->private_data = fh; fh->dev = dev; fh->radio = radio; @@ -846,6 +851,7 @@ static int video_open(struct inode *inode, struct file *file) AUDC_SET_RADIO, NULL); } #endif + unlock_kernel(); return 0; } |