diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-18 09:48:42 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-18 09:48:42 +0200 |
| commit | 4589075f331c3f32641ecd0313fe4728a9f75940 (patch) | |
| tree | 3ace0e3b8de778b4e05d37fff8c3a83f0adbd4cb /linux/drivers | |
| parent | 2315f8eef1304343666da0b452b8ec290aa32132 (diff) | |
| download | mediapointer-dvb-s2-4589075f331c3f32641ecd0313fe4728a9f75940.tar.gz mediapointer-dvb-s2-4589075f331c3f32641ecd0313fe4728a9f75940.tar.bz2 | |
usbvideo: add proper error check and add release function
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/usbvideo.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/usbvideo/usbvideo.c b/linux/drivers/media/video/usbvideo/usbvideo.c index 5bda83f7d..4b28a6dfb 100644 --- a/linux/drivers/media/video/usbvideo/usbvideo.c +++ b/linux/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; } |