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

Commit 974a911d authored by Pascal Terjan's avatar Pascal Terjan Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7334): usb video: add a device link to usbvideo devices, else hal will ignore them 



Signed-off-by: default avatarPascal Terjan <pterjan@mandriva.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c77990e7

drivers/media/video/usbvideo/usbvideo.c

+5 −4
Original line number Diff line number Diff line
@@ -1034,6 +1034,11 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd) 
		info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",

		     __FUNCTION__, uvd->iface, uvd->video_endp, uvd->paletteBits);

	}

	if (uvd->dev == NULL) {

		err("%s: uvd->dev == NULL", __FUNCTION__);

		return -EINVAL;

	}

	uvd->vdev.dev=&(uvd->dev->dev);

	if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {

		err("%s: video_register_device failed", __FUNCTION__);

		return -EPIPE;
@@ -1041,10 +1046,6 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd) 
	if (uvd->debug > 1) {

		info("%s: video_register_device() successful", __FUNCTION__);

	}

	if (uvd->dev == NULL) {

		err("%s: uvd->dev == NULL", __FUNCTION__);

		return -EINVAL;

	}



	info("%s on /dev/video%d: canvas=%s videosize=%s",

	     (uvd->handle != NULL) ? uvd->handle->drvName : "???",