summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-23 11:23:55 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-08-23 11:23:55 +0200
commit1342dc3012002c994885d1ad6efd6c819fa2805e (patch)
treebeaaeee7fdbed6a1e127a9cf6347dbf548168d12 /linux/drivers/media/video/usbvideo
parent79721c4957171ea0fdaf1fa6565e7699dad1b76e (diff)
downloadmediapointer-dvb-s2-1342dc3012002c994885d1ad6efd6c819fa2805e.tar.gz
mediapointer-dvb-s2-1342dc3012002c994885d1ad6efd6c819fa2805e.tar.bz2
v4l: add all missing video_device release callbacks
From: Hans Verkuil <hverkuil@xs4all.nl> 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. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
-rw-r--r--linux/drivers/media/video/usbvideo/usbvideo.c6
-rw-r--r--linux/drivers/media/video/usbvideo/vicam.c1
2 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/video/usbvideo/usbvideo.c b/linux/drivers/media/video/usbvideo/usbvideo.c
index 4b28a6dfb..2e29d95b6 100644
--- a/linux/drivers/media/video/usbvideo/usbvideo.c
+++ b/linux/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/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c
index 21ea88c61..e781ee46d 100644
--- a/linux/drivers/media/video/usbvideo/vicam.c
+++ b/linux/drivers/media/video/usbvideo/vicam.c
@@ -1111,6 +1111,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 */