diff options
Diffstat (limited to 'drivers/media/video/cpia2/cpia2_v4l.c')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 481e178ef56d..d129db57fcd4 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -343,7 +343,9 @@ static int cpia2_close(struct inode *inode, struct file *file) | |||
343 | cpia2_free_buffers(cam); | 343 | cpia2_free_buffers(cam); |
344 | if (!cam->present) { | 344 | if (!cam->present) { |
345 | video_unregister_device(dev); | 345 | video_unregister_device(dev); |
346 | mutex_unlock(&cam->busy_lock); | ||
346 | kfree(cam); | 347 | kfree(cam); |
348 | return 0; | ||
347 | } | 349 | } |
348 | } | 350 | } |
349 | 351 | ||
@@ -1167,9 +1169,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam) | |||
1167 | } else { | 1169 | } else { |
1168 | if(cam->params.flicker_control.cam_register & | 1170 | if(cam->params.flicker_control.cam_register & |
1169 | CPIA2_VP_FLICKER_MODES_50HZ) { | 1171 | CPIA2_VP_FLICKER_MODES_50HZ) { |
1170 | mode = FLICKER_50; | 1172 | mode = FLICKER_50; |
1171 | } else { | 1173 | } else { |
1172 | mode = FLICKER_60; | 1174 | mode = FLICKER_60; |
1173 | } | 1175 | } |
1174 | } | 1176 | } |
1175 | for(i=0; i<NUM_FLICKER_CONTROLS; i++) { | 1177 | for(i=0; i<NUM_FLICKER_CONTROLS; i++) { |