lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 015/177] media: am437x-vpfe: Setting STD to current value is not an error
    Date
    From: Benoit Parrot <bparrot@ti.com>

    [ Upstream commit 13aa21cfe92ce9ebb51824029d89f19c33f81419 ]

    VIDIOC_S_STD should not return an error if the value is identical
    to the current one.
    This error was highlighted by the v4l2-compliance test.

    Signed-off-by: Benoit Parrot <bparrot@ti.com>
    Acked-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/am437x/am437x-vpfe.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
    index b05738a95e55e..809320decdeb2 100644
    --- a/drivers/media/platform/am437x/am437x-vpfe.c
    +++ b/drivers/media/platform/am437x/am437x-vpfe.c
    @@ -1848,6 +1848,10 @@ static int vpfe_s_std(struct file *file, void *priv, v4l2_std_id std_id)
    if (!(sdinfo->inputs[0].capabilities & V4L2_IN_CAP_STD))
    return -ENODATA;

    + /* if trying to set the same std then nothing to do */
    + if (vpfe_standards[vpfe->std_index].std_id == std_id)
    + return 0;
    +
    /* If streaming is started, return error */
    if (vb2_is_busy(&vpfe->buffer_queue)) {
    vpfe_err(vpfe, "%s device busy\n", __func__);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:33    [W:2.840 / U:0.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site