]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: xilinx: regroup caps on querycap
authorGustavo Padovan <gustavo.padovan@collabora.com>
Fri, 4 May 2018 20:05:58 +0000 (16:05 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 11 May 2018 15:25:06 +0000 (11:25 -0400)
To better organize the code we concentrate the setting of
V4L2_CAP_STREAMING in one place.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/xilinx/xilinx-dma.c

index 522cdfdd334518fd578e8440d451d37a504afc7e..d041f94be832ae62888a1422e25dc70171375031 100644 (file)
@@ -494,13 +494,15 @@ xvip_dma_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
        struct v4l2_fh *vfh = file->private_data;
        struct xvip_dma *dma = to_xvip_dma(vfh->vdev);
 
-       cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
-                         | dma->xdev->v4l2_caps;
+       cap->device_caps = V4L2_CAP_STREAMING;
 
        if (dma->queue.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+               cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;
        else
-               cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+               cap->device_caps |= V4L2_CAP_VIDEO_OUTPUT;
+
+       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS
+                         | dma->xdev->v4l2_caps;
 
        strlcpy(cap->driver, "xilinx-vipp", sizeof(cap->driver));
        strlcpy(cap->card, dma->video.name, sizeof(cap->card));