V4L/DVB (8695): usbvideo: add proper error check and add release function

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index bf1bc2f69b02f727a4cad6ff13cf1f9b46b96a55..6b1b2003a65ccb604629256732e4fc24c01a7ace 100644 (file)
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1006,6 +1006,10 @@ allocate_done:
 
 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;
        }