aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvideo/usbvideo.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-23 05:23:55 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:54 -0400
commitaa5e90af7d78d1711f8f4275ce3638817c0023dc (patch)
tree5faee2ec9fe16d72fba3c729c7a81354dace8fd8 /drivers/media/video/usbvideo/usbvideo.c
parentf9e86b5e9d068854a2cf40f8003ef639e80cca6c (diff)
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/usbvideo.c')
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c6
1 files changed, 1 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:
1006 1006
1007EXPORT_SYMBOL(usbvideo_AllocateDevice); 1007EXPORT_SYMBOL(usbvideo_AllocateDevice);
1008 1008
1009static void usbvideo_dummy_release(struct video_device *vfd)
1010{
1011}
1012
1013int usbvideo_RegisterVideoDevice(struct uvd *uvd) 1009int usbvideo_RegisterVideoDevice(struct uvd *uvd)
1014{ 1010{
1015 char tmp1[20], tmp2[20]; /* Buffers for printing */ 1011 char tmp1[20], tmp2[20]; /* Buffers for printing */
@@ -1043,7 +1039,7 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
1043 return -EINVAL; 1039 return -EINVAL;
1044 } 1040 }
1045 uvd->vdev.parent = &uvd->dev->dev; 1041 uvd->vdev.parent = &uvd->dev->dev;
1046 uvd->vdev.release = usbvideo_dummy_release; 1042 uvd->vdev.release = video_device_release_empty;
1047 if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { 1043 if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) < 0) {
1048 err("%s: video_register_device failed", __func__); 1044 err("%s: video_register_device failed", __func__);
1049 return -EPIPE; 1045 return -EPIPE;