aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
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
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')
-rw-r--r--drivers/media/video/bw-qcam.c1
-rw-r--r--drivers/media/video/c-qcam.c1
-rw-r--r--drivers/media/video/cpia.c1
-rw-r--r--drivers/media/video/pms.c1
-rw-r--r--drivers/media/video/saa5249.c1
-rw-r--r--drivers/media/video/se401.c1
-rw-r--r--drivers/media/video/stradis.c1
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c6
-rw-r--r--drivers/media/video/usbvideo/vicam.c1
-rw-r--r--drivers/media/video/w9966.c1
10 files changed, 10 insertions, 5 deletions
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index e8e1bb122b59..ace4ff9ea023 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -926,6 +926,7 @@ static struct video_device qcam_template=
926{ 926{
927 .name = "Connectix Quickcam", 927 .name = "Connectix Quickcam",
928 .fops = &qcam_fops, 928 .fops = &qcam_fops,
929 .release = video_device_release_empty,
929}; 930};
930 931
931#define MAX_CAMS 4 932#define MAX_CAMS 4
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 2196c1dc5aee..17aa0adb3467 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -722,6 +722,7 @@ static struct video_device qcam_template=
722{ 722{
723 .name = "Colour QuickCam", 723 .name = "Colour QuickCam",
724 .fops = &qcam_fops, 724 .fops = &qcam_fops,
725 .release = video_device_release_empty,
725}; 726};
726 727
727/* Initialize the QuickCam driver control structure. */ 728/* Initialize the QuickCam driver control structure. */
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index a661800b0e69..c0600fdbfc6f 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3801,6 +3801,7 @@ static const struct file_operations cpia_fops = {
3801static struct video_device cpia_template = { 3801static struct video_device cpia_template = {
3802 .name = "CPiA Camera", 3802 .name = "CPiA Camera",
3803 .fops = &cpia_fops, 3803 .fops = &cpia_fops,
3804 .release = video_device_release_empty,
3804}; 3805};
3805 3806
3806/* initialise cam_data structure */ 3807/* initialise cam_data structure */
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index b39794f0baf5..994807818aa2 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -915,6 +915,7 @@ static struct video_device pms_template=
915{ 915{
916 .name = "Mediavision PMS", 916 .name = "Mediavision PMS",
917 .fops = &pms_fops, 917 .fops = &pms_fops,
918 .release = video_device_release_empty,
918}; 919};
919 920
920static struct pms_device pms_device; 921static struct pms_device pms_device;
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index dfd8a9338c55..225117c789ca 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -708,6 +708,7 @@ static struct video_device saa_template =
708{ 708{
709 .name = IF_NAME, 709 .name = IF_NAME,
710 .fops = &saa_fops, 710 .fops = &saa_fops,
711 .release = video_device_release,
711}; 712};
712 713
713MODULE_LICENSE("GPL"); 714MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c
index d16bbf0d2783..b01f25d72922 100644
--- a/drivers/media/video/se401.c
+++ b/drivers/media/video/se401.c
@@ -1236,6 +1236,7 @@ static const struct file_operations se401_fops = {
1236static struct video_device se401_template = { 1236static struct video_device se401_template = {
1237 .name = "se401 USB camera", 1237 .name = "se401 USB camera",
1238 .fops = &se401_fops, 1238 .fops = &se401_fops,
1239 .release = video_device_release_empty,
1239}; 1240};
1240 1241
1241 1242
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index a3cbe9be3c15..bbad54f85c83 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1925,6 +1925,7 @@ static struct video_device saa_template = {
1925 .name = "SAA7146A", 1925 .name = "SAA7146A",
1926 .fops = &saa_fops, 1926 .fops = &saa_fops,
1927 .minor = -1, 1927 .minor = -1,
1928 .release = video_device_release_empty,
1928}; 1929};
1929 1930
1930static int __devinit configure_saa7146(struct pci_dev *pdev, int num) 1931static int __devinit configure_saa7146(struct pci_dev *pdev, int num)
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;
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 = {
801 .name = "ViCam-based USB Camera", 801 .name = "ViCam-based USB Camera",
802 .fops = &vicam_fops, 802 .fops = &vicam_fops,
803 .minor = -1, 803 .minor = -1,
804 .release = video_device_release_empty,
804}; 805};
805 806
806/* table of devices that work with this driver */ 807/* table of devices that work with this driver */
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index c635cffb1fb8..e3580119640f 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -216,6 +216,7 @@ static const struct file_operations w9966_fops = {
216static struct video_device w9966_template = { 216static struct video_device w9966_template = {
217 .name = W9966_DRIVERNAME, 217 .name = W9966_DRIVERNAME,
218 .fops = &w9966_fops, 218 .fops = &w9966_fops,
219 .release = video_device_release_empty,
219}; 220};
220 221
221/* 222/*