diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-08-23 08:43:33 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-08-23 08:43:33 +0200 |
| commit | e7e0275a6146c377a318ea69ba83532b2ecf4080 (patch) | |
| tree | 908890d5dfd5a4e4575c4f3c74031350d4402317 /linux/drivers/media/video/usbvideo/usbvideo.c | |
| parent | 2019504e7d4a9558886c6327b9f6c684e9f5b252 (diff) | |
| parent | ab19cb308e86c5aeb0531bbbf5bfb2c09d3423a3 (diff) | |
| download | mediapointer-dvb-s2-e7e0275a6146c377a318ea69ba83532b2ecf4080.tar.gz mediapointer-dvb-s2-e7e0275a6146c377a318ea69ba83532b2ecf4080.tar.bz2 | |
merge: from v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/usbvideo/usbvideo.c')
| -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; } |