| From d0930753a2a1a92560f937f45a66df7b95492a38 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 4 Jun 2019 10:55:15 -0400 |
| Subject: media: vivid: fix incorrect assignment operation when setting video |
| mode |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit d4ec9550e4b2d2e357a46fdc65d8ef3d4d15984c ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/vivid/vivid-osd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c |
| index bdc380b14e0c4..a95b7c56569e3 100644 |
| --- a/drivers/media/platform/vivid/vivid-osd.c |
| +++ b/drivers/media/platform/vivid/vivid-osd.c |
| @@ -167,7 +167,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; |
| -- |
| 2.20.1 |
| |
