aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/meye.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/meye.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/meye.c')
-rw-r--r--drivers/media/video/meye.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index a9ef7802eb5f..cdaff2fdf394 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -845,15 +845,19 @@ static int meye_open(struct inode *inode, struct file *file)
845{ 845{
846 int i, err; 846 int i, err;
847 847
848 lock_kernel();
848 err = video_exclusive_open(inode, file); 849 err = video_exclusive_open(inode, file);
849 if (err < 0) 850 if (err < 0) {
851 unlock_kernel();
850 return err; 852 return err;
853 }
851 854
852 mchip_hic_stop(); 855 mchip_hic_stop();
853 856
854 if (mchip_dma_alloc()) { 857 if (mchip_dma_alloc()) {
855 printk(KERN_ERR "meye: mchip framebuffer allocation failed\n"); 858 printk(KERN_ERR "meye: mchip framebuffer allocation failed\n");
856 video_exclusive_release(inode, file); 859 video_exclusive_release(inode, file);
860 unlock_kernel();
857 return -ENOBUFS; 861 return -ENOBUFS;
858 } 862 }
859 863
@@ -861,6 +865,7 @@ static int meye_open(struct inode *inode, struct file *file)
861 meye.grab_buffer[i].state = MEYE_BUF_UNUSED; 865 meye.grab_buffer[i].state = MEYE_BUF_UNUSED;
862 kfifo_reset(meye.grabq); 866 kfifo_reset(meye.grabq);
863 kfifo_reset(meye.doneq); 867 kfifo_reset(meye.doneq);
868 unlock_kernel();
864 return 0; 869 return 0;
865} 870}
866 871