diff --git a/[refs] b/[refs]
index 50796930d24c..434704d6a23f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7597e8e71f897449a26d5a32eedc09f8e76ae52a
+refs/heads/master: bafefc0cf8e4b34fbb159ea2e2aef2358ebff935
diff --git a/trunk/drivers/media/video/cpia2/cpia2_v4l.c b/trunk/drivers/media/video/cpia2/cpia2_v4l.c
index 28d93c595df0..d129db57fcd4 100644
--- a/trunk/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/trunk/drivers/media/video/cpia2/cpia2_v4l.c
@@ -343,7 +343,9 @@ static int cpia2_close(struct inode *inode, struct file *file)
 		cpia2_free_buffers(cam);
 		if (!cam->present) {
 			video_unregister_device(dev);
+			mutex_unlock(&cam->busy_lock);
 			kfree(cam);
+			return 0;
 		}
 	}