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

[media] media/platform: 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>
Cc: Scott Jiang <scott.jiang.linux@gmail.com>
Cc: Gerhard Sittig <gsi@denx.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
a020c747 7027c448

+16 -19
+2 -1
drivers/media/platform/blackfin/bfin_capture.c
··· 841 841 { 842 842 struct bcap_device *bcap_dev = video_drvdata(file); 843 843 844 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 844 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 845 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 845 846 strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver)); 846 847 strlcpy(cap->bus_info, "Blackfin Platform", sizeof(cap->bus_info)); 847 848 strlcpy(cap->card, bcap_dev->cfg->card_name, sizeof(cap->card));
+2 -1
drivers/media/platform/fsl-viu.c
··· 604 604 { 605 605 strcpy(cap->driver, "viu"); 606 606 strcpy(cap->card, "viu"); 607 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 607 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | 608 608 V4L2_CAP_STREAMING | 609 609 V4L2_CAP_VIDEO_OVERLAY | 610 610 V4L2_CAP_READWRITE; 611 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 611 612 return 0; 612 613 } 613 614
+2 -2
drivers/media/platform/marvell-ccic/mcam-core.c
··· 1408 1408 { 1409 1409 strcpy(cap->driver, "marvell_ccic"); 1410 1410 strcpy(cap->card, "marvell_ccic"); 1411 - cap->version = 1; 1412 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 1411 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | 1413 1412 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; 1413 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 1414 1414 return 0; 1415 1415 } 1416 1416
+2 -7
drivers/media/platform/mx2_emmaprp.c
··· 402 402 { 403 403 strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1); 404 404 strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1); 405 - /* 406 - * This is only a mem-to-mem video device. The capture and output 407 - * device capability flags are left only for backward compatibility 408 - * and are scheduled for removal. 409 - */ 410 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | 411 - V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; 405 + cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; 406 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 412 407 return 0; 413 408 } 414 409
+2 -1
drivers/media/platform/omap/omap_vout.c
··· 1054 1054 strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver)); 1055 1055 strlcpy(cap->card, vout->vfd->name, sizeof(cap->card)); 1056 1056 cap->bus_info[0] = '\0'; 1057 - cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT | 1057 + cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT | 1058 1058 V4L2_CAP_VIDEO_OUTPUT_OVERLAY; 1059 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 1059 1060 1060 1061 return 0; 1061 1062 }
+2 -1
drivers/media/platform/sh_vou.c
··· 396 396 dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__); 397 397 398 398 strlcpy(cap->card, "SuperH VOU", sizeof(cap->card)); 399 - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; 399 + cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; 400 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 400 401 return 0; 401 402 } 402 403
+2 -2
drivers/media/platform/via-camera.c
··· 985 985 { 986 986 strcpy(cap->driver, "via-camera"); 987 987 strcpy(cap->card, "via-camera"); 988 - cap->version = 1; 989 - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 988 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | 990 989 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; 990 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 991 991 return 0; 992 992 } 993 993
+2 -4
drivers/media/platform/vino.c
··· 2932 2932 strcpy(cap->driver, vino_driver_name); 2933 2933 strcpy(cap->card, vino_driver_description); 2934 2934 strcpy(cap->bus_info, vino_bus_name); 2935 - cap->capabilities = 2936 - V4L2_CAP_VIDEO_CAPTURE | 2937 - V4L2_CAP_STREAMING; 2938 - // V4L2_CAP_OVERLAY, V4L2_CAP_READWRITE 2935 + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 2936 + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; 2939 2937 return 0; 2940 2938 } 2941 2939