Merge "msm: camera: ope: remove the check for dev_type" into camera-kernel.lnx.3.1 (a8823950) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1087,8 +1087,7 @@ static int cam_ope_calc_total_clk(struct cam_ope_hw_mgr *hw_mgr,
		hw_mgr_clk_info->base_clk = 0;
		for (i = 0; i < OPE_CTX_MAX; i++) {
		ctx_data = &hw_mgr->ctx[i];
		if (ctx_data->ctx_state == OPE_CTX_STATE_ACQUIRED &&
		ctx_data->ope_acquire.dev_type == dev_type)
		if (ctx_data->ctx_state == OPE_CTX_STATE_ACQUIRED)
		hw_mgr_clk_info->base_clk +=
		ctx_data->clk_info.base_clk;
		}