media: don't do a 31 bit shift on a signed int

[sfrench/cifs-2.6.git] / drivers / media / platform / s5p-mfc / s5p_mfc_opr_v5.c

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index f76a074009665c73563ee75aa065a8285dd3b073..49503c20d32004b21cf6cdc01ca76c9a86a513b9 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -711,7 +711,7 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
        reg = mfc_read(dev, S5P_FIMV_ENC_PADDING_CTRL);
        if (p->pad) {
                /** enable */
-               reg |= (1 << 31);
+               reg |= (1UL << 31);
                /** cr value */
                reg &= ~(0xFF << 16);
                reg |= (p->pad_cr << 16);
@@ -955,7 +955,7 @@ static int s5p_mfc_set_enc_params_mpeg4(struct s5p_mfc_ctx *ctx)
                                S5P_FIMV_ENC_RC_FRAME_RATE);
                        shm = s5p_mfc_read_info_v5(ctx, RC_VOP_TIMING);
                        shm &= ~(0xFFFFFFFF);
-                       shm |= (1 << 31);
+                       shm |= (1UL << 31);
                        shm |= ((p->rc_framerate_num & 0x7FFF) << 16);
                        shm |= (p->rc_framerate_denom & 0xFFFF);
                        s5p_mfc_write_info_v5(ctx, shm, RC_VOP_TIMING);