diff --git a/[refs] b/[refs]
index b30a5dfdf58e..e4032c9820cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20c104d0a4d055cfa3df4fcbae818f8e10bd541a
+refs/heads/master: 6ea9a1829a89515c1866151b1fdca7ee612d1490
diff --git a/trunk/drivers/media/video/v4l2-dev.c b/trunk/drivers/media/video/v4l2-dev.c
index 02b9cc76d36b..7addf2fd55de 100644
--- a/trunk/drivers/media/video/v4l2-dev.c
+++ b/trunk/drivers/media/video/v4l2-dev.c
@@ -91,8 +91,11 @@ static void v4l2_chardev_release(struct kobject *kobj)
 	struct video_device *vfd = container_of(kobj, struct video_device, cdev.kobj);
 
 	mutex_lock(&videodev_lock);
-	if (video_device[vfd->minor] != vfd)
-		panic("videodev: bad release");
+	if (video_device[vfd->minor] != vfd) {
+		mutex_unlock(&videodev_lock);
+		BUG();
+		return;
+	}
 
 	/* Free up this device for reuse */
 	video_device[vfd->minor] = NULL;