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

Commit 4f702d4e 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: Avoid recursion for operating rate"

parents 0df190ee 54b92df6

drivers/media/platform/msm/vidc/msm_vdec.c

+0 −3
Original line number Diff line number Diff line
@@ -1061,9 +1061,6 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
			inst, inst->clk_data.operating_rate >> 16,

				ctrl->val >> 16);

		inst->clk_data.operating_rate = ctrl->val;



		msm_vidc_update_operating_rate(inst);



		break;

	default:

		break;

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

+0 −2
Original line number Diff line number Diff line
@@ -1748,8 +1748,6 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
				ctrl->val >> 16);

		inst->clk_data.operating_rate = ctrl->val;



		msm_vidc_update_operating_rate(inst);



		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_VENC_BITRATE_TYPE:

	{

drivers/media/platform/msm/vidc/msm_vidc_clocks.c

+0 −2
Original line number Diff line number Diff line
@@ -791,8 +791,6 @@ void msm_clock_data_reset(struct msm_vidc_inst *inst) 


	msm_dcvs_print_dcvs_stats(dcvs);



	msm_vidc_update_operating_rate(inst);



	rc = msm_comm_scale_clocks_and_bus(inst);



	if (rc)