From 2f0fa5b4cd1735346b396d0eb98c49ecca46f14a Mon Sep 17 00:00:00 2001 From: Alok Chauhan Date: Wed, 28 Jul 2021 19:17:52 +0530 Subject: [PATCH] msm: camera: isp: Correct error check in clock rate assignment Error check is not proper while assigning clock rates. this is causing failure on updated clock rates. CRs-Fixed: 2998722 Change-Id: Id8634438a7930362e4b8eb010b523dc2def1f043 Signed-off-by: Alok Chauhan --- drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c index d3e2b3d24cf9..f947249cd129 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c @@ -1965,6 +1965,12 @@ int cam_tfe_cshiphy_callback( &ctx->res_list_tfe_csid, list) { rc = cam_tfe_hw_mgr_update_clock_rate(hw_mgr_res, phy_clock_rate, &updated_csid_clk); + if (rc) { + CAM_ERR(CAM_ISP, + "csid clock update failed: %d, csid:%lld tfe:%lld", + rc, csid_clock_rate, tfe_clock_rate); + goto end; + } } if (updated_csid_clk > tfe_clock_rate) { @@ -1972,9 +1978,15 @@ int cam_tfe_cshiphy_callback( &ctx->res_list_tfe_in, list) { rc = cam_tfe_hw_mgr_update_clock_rate(hw_mgr_res, &updated_csid_clk, &updated_tfe_clk); + if (rc) { + CAM_ERR(CAM_ISP, + "tfe clock update failed: %d, csid:%lld tfe:%lld", + rc, updated_csid_clk, tfe_clock_rate); + goto end; + } } } - goto end; + goto skip_tfe_update; } if (csid_clock_rate > tfe_clock_rate) { @@ -1982,9 +1994,16 @@ int cam_tfe_cshiphy_callback( &ctx->res_list_tfe_in, list) { rc = cam_tfe_hw_mgr_update_clock_rate(hw_mgr_res, &csid_clock_rate, &updated_tfe_clk); + if (rc) { + CAM_ERR(CAM_ISP, + "tfe clock update failed: %d, csid:%lld tfe:%lld", + rc, csid_clock_rate, tfe_clock_rate); + goto end; + } } } +skip_tfe_update: if (!updated_csid_clk) updated_csid_clk = csid_clock_rate;