aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/marvell-ccic
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-11-24 04:37:25 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-02 08:31:34 -0500
commita020c747bf177b96b931ddbb8d87ed6fc800036d (patch)
tree743b713740d5fc9855303ae5df158eba7802620f /drivers/media/platform/marvell-ccic
parent7027c448d2408827ce6f952a161fcb6254fb2234 (diff)
[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>
Diffstat (limited to 'drivers/media/platform/marvell-ccic')
-rw-r--r--drivers/media/platform/marvell-ccic/mcam-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index ce00cbaf850e..b65761b45568 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1408,9 +1408,9 @@ static int mcam_vidioc_querycap(struct file *file, void *priv,
1408{ 1408{
1409 strcpy(cap->driver, "marvell_ccic"); 1409 strcpy(cap->driver, "marvell_ccic");
1410 strcpy(cap->card, "marvell_ccic"); 1410 strcpy(cap->card, "marvell_ccic");
1411 cap->version = 1; 1411 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
1412 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
1413 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; 1412 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
1413 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
1414 return 0; 1414 return 0;
1415} 1415}
1416 1416