---

yaml --- r: 113835 b: refs/heads/master c: e758c6f h: refs/heads/master i: 113833: 75b022e 113831: 904f94e v: v3
git-mirror · Oct 12, 2008 · 1dcaa0a · 1dcaa0a
1 parent bb25e0e
commit 1dcaa0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66c6bda79fdc273608e2700a0c6dd4cb82d0bac3
+refs/heads/master: e758c6f86bc53009893dfa517b9bb3a408d7a2e2
diff --git a/trunk/drivers/media/video/usbvideo/usbvideo.c b/trunk/drivers/media/video/usbvideo/usbvideo.c
@@ -1006,6 +1006,10 @@ struct uvd *usbvideo_AllocateDevice(struct usbvideo *cams)
 
 EXPORT_SYMBOL(usbvideo_AllocateDevice);
 
+static void usbvideo_dummy_release(struct video_device *vfd)
+{
+}
+
 int usbvideo_RegisterVideoDevice(struct uvd *uvd)
 {
 	char tmp1[20], tmp2[20];	/* Buffers for printing */
@@ -1039,7 +1043,8 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
 		return -EINVAL;
 	}
 	uvd->vdev.parent = &uvd->dev->dev;
-	if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
+	uvd->vdev.release = usbvideo_dummy_release;
+	if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
 		err("%s: video_register_device failed", __func__);
 		return -EPIPE;
 	}