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

Commit d5892f62 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc_3x: Fix for KW warnings."

parents 516f28b6 c0b3e6f0

drivers/media/platform/msm/vidc_3x/msm_venc.c

+15 −0
Original line number Diff line number Diff line
@@ -2327,6 +2327,11 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
		}

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_VPX_MIN_QP);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control");

			return -EINVAL;

		}

		min = temp_ctrl->minimum;

		if (!VALIDATE_BOUNDARIES(min, max, qp_value))

			rc = -EINVAL;
@@ -2341,6 +2346,11 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
		}

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control");

			return -EINVAL;

		}

		min = temp_ctrl->minimum;

		if (!VALIDATE_BOUNDARIES(min, max, qp_value))

			rc = -EINVAL;
@@ -2355,6 +2365,11 @@ static int msm_venc_validate_qp_value(struct msm_vidc_inst *inst, 
		}

		max = temp_ctrl->maximum;

		temp_ctrl = TRY_GET_CTRL(V4L2_CID_MPEG_VIDEO_H264_MIN_QP);

		if (!temp_ctrl) {

			dprintk(VIDC_ERR,

				"failed to get control");

			return -EINVAL;

		}

		min = temp_ctrl->minimum;

		if (!VALIDATE_BOUNDARIES(min, max, qp_value))

			rc = -EINVAL;

drivers/media/platform/msm/vidc_3x/venus_hfi.c

+1 −1
Original line number Diff line number Diff line
@@ -4521,7 +4521,7 @@ static int venus_hfi_get_fw_info(void *dev, struct hal_fw_info *fw_info) 
	struct venus_hfi_device *device = dev;

	u32 smem_block_size = 0;

	u8 *smem_table_ptr;

	char version[VENUS_VERSION_LENGTH];

	char version[VENUS_VERSION_LENGTH] = "";

	const u32 smem_image_index_venus = 14 * 128;



	if (!device || !fw_info) {