提交 e758c6f8 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

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

Signed-off-by: NHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 66c6bda7
...@@ -1006,6 +1006,10 @@ struct uvd *usbvideo_AllocateDevice(struct usbvideo *cams) ...@@ -1006,6 +1006,10 @@ struct uvd *usbvideo_AllocateDevice(struct usbvideo *cams)
EXPORT_SYMBOL(usbvideo_AllocateDevice); EXPORT_SYMBOL(usbvideo_AllocateDevice);
static void usbvideo_dummy_release(struct video_device *vfd)
{
}
int usbvideo_RegisterVideoDevice(struct uvd *uvd) int usbvideo_RegisterVideoDevice(struct uvd *uvd)
{ {
char tmp1[20], tmp2[20]; /* Buffers for printing */ char tmp1[20], tmp2[20]; /* Buffers for printing */
...@@ -1039,7 +1043,8 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd) ...@@ -1039,7 +1043,8 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
return -EINVAL; return -EINVAL;
} }
uvd->vdev.parent = &uvd->dev->dev; 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__); err("%s: video_register_device failed", __func__);
return -EPIPE; return -EPIPE;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册