aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-11-24 04:37:23 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-02 08:30:34 -0500
commit2eb3b1adcb9309245785ebbddf8022ec57746bc9 (patch)
treeae578118461ea85d5a37acff39131e7b70c77abb /drivers/media/usb
parent57e774cc916efa293471bf12d1177574e121378e (diff)
[media] media/usb,pci: fix querycap
Querycap shouldn't set the version field (the core does that for you), but it should set the device_caps field. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/usbvision/usbvision-video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index 9bfa041e3316..693d5f409138 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -509,11 +509,12 @@ static int vidioc_querycap(struct file *file, void *priv,
509 usbvision_device_data[usbvision->dev_model].model_string, 509 usbvision_device_data[usbvision->dev_model].model_string,
510 sizeof(vc->card)); 510 sizeof(vc->card));
511 usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info)); 511 usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info));
512 vc->capabilities = V4L2_CAP_VIDEO_CAPTURE | 512 vc->device_caps = V4L2_CAP_VIDEO_CAPTURE |
513 V4L2_CAP_AUDIO | 513 V4L2_CAP_AUDIO |
514 V4L2_CAP_READWRITE | 514 V4L2_CAP_READWRITE |
515 V4L2_CAP_STREAMING | 515 V4L2_CAP_STREAMING |
516 (usbvision->have_tuner ? V4L2_CAP_TUNER : 0); 516 (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
517 vc->capabilities = vc->device_caps | V4L2_CAP_DEVICE_CAPS;
517 return 0; 518 return 0;
518} 519}
519 520