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 <dafna3@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c
index 5630f1dc45e649eaa569ed3ec0fed9f1d22dc2cd..a6fd0477633be04749fc603b877f4edc35feed45 100644 (file)
--- a/drivers/media/platform/vicodec/codec-fwht.c
+++ b/drivers/media/platform/vicodec/codec-fwht.c
@@ -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;