Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e758c6f8 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 66c6bda7

drivers/media/video/usbvideo/usbvideo.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

	}