Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
2eb3b1ad 57e774cc

+5 -6
-3
drivers/media/pci/meye/meye.c
··· 1031 1031 strcpy(cap->card, "meye"); 1032 1032 sprintf(cap->bus_info, "PCI:%s", pci_name(meye.mchip_dev)); 1033 1033 1034 - cap->version = (MEYE_DRIVER_MAJORVERSION << 8) + 1035 - MEYE_DRIVER_MINORVERSION; 1036 - 1037 1034 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | 1038 1035 V4L2_CAP_STREAMING; 1039 1036 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+3 -2
drivers/media/pci/zoran/zoran_driver.c
··· 1528 1528 strncpy(cap->driver, "zoran", sizeof(cap->driver)-1); 1529 1529 snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", 1530 1530 pci_name(zr->pci_dev)); 1531 - cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE | 1532 - V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OVERLAY; 1531 + cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE | 1532 + V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OVERLAY; 1533 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 1533 1534 return 0; 1534 1535 } 1535 1536
+2 -1
drivers/media/usb/usbvision/usbvision-video.c
··· 509 509 usbvision_device_data[usbvision->dev_model].model_string, 510 510 sizeof(vc->card)); 511 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 513 V4L2_CAP_AUDIO | 514 514 V4L2_CAP_READWRITE | 515 515 V4L2_CAP_STREAMING | 516 516 (usbvision->have_tuner ? V4L2_CAP_TUNER : 0); 517 + vc->capabilities = vc->device_caps | V4L2_CAP_DEVICE_CAPS; 517 518 return 0; 518 519 } 519 520