lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 316/601] media: vivid: fix assignment of dev->fbuf_out_flags
    Date
    From: Colin Ian King <colin.king@canonical.com>

    [ Upstream commit 5cde22fcc7271812a7944c47b40100df15908358 ]

    Currently the chroma_flags and alpha_flags are being zero'd with a bit-wise
    mask and the following statement should be bit-wise or'ing in the new flag
    bits but instead is making a direct assignment. Fix this by using the |=
    operator rather than an assignment.

    Addresses-Coverity: ("Unused value")

    Fixes: ef834f7836ec ("[media] vivid: add the video capture and output parts")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/test-drivers/vivid/vivid-vid-out.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c b/drivers/media/test-drivers/vivid/vivid-vid-out.c
    index ac1e981e8342..9f731f085179 100644
    --- a/drivers/media/test-drivers/vivid/vivid-vid-out.c
    +++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c
    @@ -1021,7 +1021,7 @@ int vivid_vid_out_s_fbuf(struct file *file, void *fh,
    return -EINVAL;
    }
    dev->fbuf_out_flags &= ~(chroma_flags | alpha_flags);
    - dev->fbuf_out_flags = a->flags & (chroma_flags | alpha_flags);
    + dev->fbuf_out_flags |= a->flags & (chroma_flags | alpha_flags);
    return 0;
    }

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 19:32    [W:2.102 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site