On 03/09/2018 09:49 AM, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.pado...@collabora.com>
> 
> To better organize the code we concentrate the setting of
> V4L2_CAP_STREAMING in one place.
> 
> Signed-off-by: Gustavo Padovan <gustavo.pado...@collabora.com>
> ---
>  drivers/media/platform/xilinx/xilinx-dma.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/xilinx/xilinx-dma.c 
> b/drivers/media/platform/xilinx/xilinx-dma.c
> index 522cdfdd3345..565e466ba4fa 100644
> --- a/drivers/media/platform/xilinx/xilinx-dma.c
> +++ b/drivers/media/platform/xilinx/xilinx-dma.c
> @@ -494,13 +494,14 @@ 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
> +     cap->device_caps = V4L2_CAP_STREAMING;
> +     cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS
>                         | dma->xdev->v4l2_caps;

Shouldn't this cap->capabilities assignment be moved down to after the
if-else? Otherwise cap->device_caps isn't fully initialized yet.

>  
>       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;
>  
>       strlcpy(cap->driver, "xilinx-vipp", sizeof(cap->driver));
>       strlcpy(cap->card, dma->video.name, sizeof(cap->card));
> 

Regards,

        Hans

Reply via email to