| From c13a034e4283335f95451af87ff14b0cd815f4c5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 25 Feb 2021 16:43:27 +0100 |
| Subject: media: vivid: fix assignment of dev->fbuf_out_flags |
| |
| 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/platform/vivid/vivid-vid-out.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c |
| index 3e7a26d15074..4629679a0f3c 100644 |
| --- a/drivers/media/platform/vivid/vivid-vid-out.c |
| +++ b/drivers/media/platform/vivid/vivid-vid-out.c |
| @@ -1010,7 +1010,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 |
| |