summaryrefslogtreecommitdiff
path: root/drivers/media/video/zr364xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/zr364xx.c')
-rw-r--r--drivers/media/video/zr364xx.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 18d1c4ba79fb..4e1ef10d22df 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -643,14 +643,18 @@ static int zr364xx_open(struct inode *inode, struct file *file)
cam->skip = 2;
+ lock_kernel();
err = video_exclusive_open(inode, file);
- if (err < 0)
+ if (err < 0) {
+ unlock_kernel();
return err;
+ }
if (!cam->framebuf) {
cam->framebuf = vmalloc_32(MAX_FRAME_SIZE * FRAMES);
if (!cam->framebuf) {
info("vmalloc_32 failed!");
+ unlock_kernel();
return -ENOMEM;
}
}
@@ -664,6 +668,7 @@ static int zr364xx_open(struct inode *inode, struct file *file)
if (err < 0) {
info("error during open sequence: %d", i);
mutex_unlock(&cam->lock);
+ unlock_kernel();
return err;
}
}
@@ -676,6 +681,7 @@ static int zr364xx_open(struct inode *inode, struct file *file)
mdelay(100);
mutex_unlock(&cam->lock);
+ unlock_kernel();
return 0;
}