diff options
| author | Hans Verkuil | 2014-11-24 10:37:25 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-12-02 14:31:34 +0100 |
| commit | a020c747bf177b96b931ddbb8d87ed6fc800036d (patch) | |
| tree | 743b713740d5fc9855303ae5df158eba7802620f /drivers/media/platform/marvell-ccic | |
| parent | [media] media/radio: fix querycap (diff) | |
| download | kernel-qcow2-linux-a020c747bf177b96b931ddbb8d87ed6fc800036d.tar.gz kernel-qcow2-linux-a020c747bf177b96b931ddbb8d87ed6fc800036d.tar.xz kernel-qcow2-linux-a020c747bf177b96b931ddbb8d87ed6fc800036d.zip | |
[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.c | 4 |
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, { strcpy(cap->driver, "marvell_ccic"); strcpy(cap->card, "marvell_ccic"); - cap->version = 1; - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; } |