summaryrefslogtreecommitdiff
path: root/drivers/media/platform/vivid/vivid-osd.c
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2019-06-04 10:55:15 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-05 15:25:15 -0400
commitd4ec9550e4b2d2e357a46fdc65d8ef3d4d15984c (patch)
tree4e44e10c4ad7eeb919c70146065565587390eb6a /drivers/media/platform/vivid/vivid-osd.c
parent0c6280b3c353868a1a40596585db43af756b0617 (diff)
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>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-osd.c')
-rw-r--r--drivers/media/platform/vivid/vivid-osd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c
index 1a89593b0c86..f2e789bdf4a6 100644
--- 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;