diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-18 11:48:42 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 15:36:50 +0400 |
| commit | e758c6f86bc53009893dfa517b9bb3a408d7a2e2 (patch) | |
| tree | 98fdcbaea9771baf401d38aeb67032f93154dc8a /drivers/media/video/usbvideo/usbvideo.c | |
| parent | 66c6bda79fdc273608e2700a0c6dd4cb82d0bac3 (diff) | |
| download | linux-e758c6f86bc53009893dfa517b9bb3a408d7a2e2.tar.xz | |
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>
Diffstat (limited to 'drivers/media/video/usbvideo/usbvideo.c')
| -rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index bf1bc2f69b02..6b1b2003a65c 100644 --- 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; } |