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

[media] staging/media: 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>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
57e774cc dfdf780b

+9 -9
+3 -2
drivers/staging/media/bcm2048/radio-bcm2048.c
··· 2327 2327 strlcpy(capability->card, BCM2048_DRIVER_CARD, 2328 2328 sizeof(capability->card)); 2329 2329 snprintf(capability->bus_info, 32, "I2C: 0x%X", bdev->client->addr); 2330 - capability->version = BCM2048_DRIVER_VERSION; 2331 - capability->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO | 2330 + capability->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO | 2332 2331 V4L2_CAP_HW_FREQ_SEEK; 2332 + capability->capabilities = capability->device_caps | 2333 + V4L2_CAP_DEVICE_CAPS; 2333 2334 2334 2335 return 0; 2335 2336 }
+4 -4
drivers/staging/media/davinci_vpfe/vpfe_video.c
··· 600 600 v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querycap\n"); 601 601 602 602 if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) 603 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 603 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 604 604 else 605 - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; 606 - cap->device_caps = cap->capabilities; 607 - cap->version = VPFE_CAPTURE_VERSION_CODE; 605 + cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; 606 + cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | 607 + V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS; 608 608 strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver)); 609 609 strlcpy(cap->bus_info, "VPFE", sizeof(cap->bus_info)); 610 610 strlcpy(cap->card, vpfe_dev->cfg->card_name, sizeof(cap->card));
+2 -3
drivers/staging/media/dt3155v4l/dt3155v4l.c
··· 512 512 strcpy(cap->driver, DT3155_NAME); 513 513 strcpy(cap->card, DT3155_NAME " frame grabber"); 514 514 sprintf(cap->bus_info, "PCI:%s", pci_name(pd->pdev)); 515 - cap->version = 516 - KERNEL_VERSION(DT3155_VER_MAJ, DT3155_VER_MIN, DT3155_VER_EXT); 517 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 515 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | 518 516 DT3155_CAPTURE_METHOD; 517 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 519 518 return 0; 520 519 } 521 520