Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6055d458 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

media: vivid: fix assignment of dev->fbuf_out_flags 



[ 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: ef834f78 ("[media] vivid: add the video capture and output parts")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f418c842

drivers/media/platform/vivid/vivid-vid-out.c

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,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;

}