media: vivid: fix incorrect assignment operation when setting video mode

The assigment of FB_VMODE_NONINTERLACE to var->vmode should be a
bit-wise or of FB_VMODE_NONINTERLACE instead of an assignment,
otherwise the previous clearing of the FB_VMODE_MASK bits of
var->vmode makes no sense and is redundant.

Addresses-Coverity: ("Unused value")
Fixes: ad4e02d5081d ("[media] vivid: add a simple framebuffer device for overlay testing")
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+samsung@kernel.org>

diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c
index 1a89593b0c86ffe697e58560b7b4ad4b668af04c..f2e789bdf4a65fc20815518eee5507d25077c35f 100644 (file)
--- a/drivers/media/platform/vivid/vivid-osd.c
+++ b/drivers/media/platform/vivid/vivid-osd.c
@@ -155,7 +155,7 @@ static int _vivid_fb_check_var(struct fb_var_screeninfo *var, struct vivid_dev *
        var->nonstd = 0;
 
        var->vmode &= ~FB_VMODE_MASK;
-       var->vmode = FB_VMODE_NONINTERLACED;
+       var->vmode |= FB_VMODE_NONINTERLACED;
 
        /* Dummy values */
        var->hsync_len = 24;