summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvideo
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-23 06:23:55 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:36:54 -0200
commitaa5e90af7d78d1711f8f4275ce3638817c0023dc (patch)
tree5faee2ec9fe16d72fba3c729c7a81354dace8fd8 /drivers/media/video/usbvideo
parentf9e86b5e9d068854a2cf40f8003ef639e80cca6c (diff)
downloadblackbird-op-linux-aa5e90af7d78d1711f8f4275ce3638817c0023dc.tar.gz
blackbird-op-linux-aa5e90af7d78d1711f8f4275ce3638817c0023dc.zip
V4L/DVB (8783): v4l: add all missing video_device release callbacks
All drivers that call video_device_register where checked to see if they set the release callback of struct video_device. Where that callback was missing it was added. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/usbvideo')
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c6
-rw-r--r--drivers/media/video/usbvideo/vicam.c1
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 6b1b2003a65c..9569e8ced4b4 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1006,10 +1006,6 @@ 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 */
@@ -1043,7 +1039,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
return -EINVAL;
}
uvd->vdev.parent = &uvd->dev->dev;
- uvd->vdev.release = usbvideo_dummy_release;
+ uvd->vdev.release = video_device_release_empty;
if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
err("%s: video_register_device failed", __func__);
return -EPIPE;
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index efb878a7402e..d7728256f295 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -801,6 +801,7 @@ static struct video_device vicam_template = {
.name = "ViCam-based USB Camera",
.fops = &vicam_fops,
.minor = -1,
+ .release = video_device_release_empty,
};
/* table of devices that work with this driver */
OpenPOWER on IntegriCloud