aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-06-04 07:19:53 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-05 08:24:49 -0400
commit8c3854d03bd7b86e8f36e6d9b07b4a6bc20deccd (patch)
tree61c61149adad3b110f65dd27341053dd32214856 /drivers/media/usb/gspca
parente83ce3005db16243e1085925251fd0776bb60d09 (diff)
media: media/usb: set device_caps in struct video_device
Instead of filling in the struct v4l2_capability device_caps field, fill in the struct video_device device_caps field. That way the V4L2 core knows what the capabilities of the video device are. But this only really works if all drivers use this, so convert all usb drivers in this patch. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/usb/gspca')
-rw-r--r--drivers/media/usb/gspca/gspca.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index 4d7517411cc2..d389020b50f9 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -1218,10 +1218,6 @@ static int vidioc_querycap(struct file *file, void *priv,
1218 } 1218 }
1219 usb_make_path(gspca_dev->dev, (char *) cap->bus_info, 1219 usb_make_path(gspca_dev->dev, (char *) cap->bus_info,
1220 sizeof(cap->bus_info)); 1220 sizeof(cap->bus_info));
1221 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE
1222 | V4L2_CAP_STREAMING
1223 | V4L2_CAP_READWRITE;
1224 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
1225 return 0; 1221 return 0;
1226} 1222}
1227 1223
@@ -1517,6 +1513,8 @@ int gspca_dev_probe2(struct usb_interface *intf,
1517 gspca_dev->empty_packet = -1; /* don't check the empty packets */ 1513 gspca_dev->empty_packet = -1; /* don't check the empty packets */
1518 gspca_dev->vdev = gspca_template; 1514 gspca_dev->vdev = gspca_template;
1519 gspca_dev->vdev.v4l2_dev = &gspca_dev->v4l2_dev; 1515 gspca_dev->vdev.v4l2_dev = &gspca_dev->v4l2_dev;
1516 gspca_dev->vdev.device_caps = V4L2_CAP_VIDEO_CAPTURE |
1517 V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
1520 video_set_drvdata(&gspca_dev->vdev, gspca_dev); 1518 video_set_drvdata(&gspca_dev->vdev, gspca_dev);
1521 gspca_dev->module = module; 1519 gspca_dev->module = module;
1522 1520