summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/v4l2-dev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 06:01:57 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-02 06:01:57 -0300
commitbb0211fef21b5bdaeac73958b01dd55c848e7528 (patch)
tree9019f6b354ea0684560e40992272fc2cdea1f978 /linux/drivers/media/video/v4l2-dev.c
parent6ac3002c45d81596d94c48fedcdb200010793c23 (diff)
parentd6db2f85c6d097e28ed29d23316c671db5539892 (diff)
downloadmediapointer-dvb-s2-bb0211fef21b5bdaeac73958b01dd55c848e7528.tar.gz
mediapointer-dvb-s2-bb0211fef21b5bdaeac73958b01dd55c848e7528.tar.bz2
merge: http://linuxtv.org/hg/~pb/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
-rw-r--r--linux/drivers/media/video/v4l2-dev.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c
index 0d081cb91..a2daea31c 100644
--- a/linux/drivers/media/video/v4l2-dev.c
+++ b/linux/drivers/media/video/v4l2-dev.c
@@ -111,8 +111,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;