From 1dcaa0ab02484f8d6f2f3ae45d80d6684c55ce3e Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 18 Aug 2008 04:48:42 -0300 Subject: [PATCH] --- yaml --- r: 113835 b: refs/heads/master c: e758c6f86bc53009893dfa517b9bb3a408d7a2e2 h: refs/heads/master i: 113833: 75b022ebcc418291fc972911cba61753ab129b4d 113831: 904f94eb64206a57cd16679d3286bbf583ef04b5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/usbvideo/usbvideo.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e9eed4aa647f..d90547b305fe 100644 --- 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 index bf1bc2f69b02..6b1b2003a65c 100644 --- 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; }