media: vicodec: bugfix - replace '=' with '|='

PATCH New Dafna Hirschfeld 1 participant 1 message Dec 17, 2018 Media (V4L/DVB)

Share & tools

Dafna Hirschfeld

author

2018-12-17 17:57 UTC #0 lore raw

PATCH v2 1/1 media: vicodec: bugfix - replace '=' with '|='

In the fwht_encode_frame, 'encoding = encode_plane' should be replaced with 'encoding |= encode_plane' so existing flags won't be overwrriten.

Signed-off-by Dafna Hirschfeld <[email protected]>

---
 drivers/media/platform/vicodec/codec-fwht.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/media/platform/vicodec/codec-fwht.c +4 -4

index 5630f1dc45e6..a6fd0477633b 100644
@@ -787,10 +787,10 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm,
 
 	if (frm->components_num == 4) {
 		rlco_max = rlco + size / 2 - 256;
-		encoding = encode_plane(frm->alpha, ref_frm->alpha, &rlco,
-					rlco_max, cf, frm->height, frm->width,
-					frm->luma_alpha_step,
-					is_intra, next_is_intra);
+		encoding |= encode_plane(frm->alpha, ref_frm->alpha, &rlco,
+					 rlco_max, cf, frm->height, frm->width,
+					 frm->luma_alpha_step,
+					 is_intra, next_is_intra);
 		if (encoding & FWHT_FRAME_UNENCODED)
 			encoding |= FWHT_ALPHA_UNENCODED;
 		encoding &= ~FWHT_FRAME_UNENCODED;

Signature · 1 line

2.17.1