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

Commit 4c107503 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: Fix issue in camera GDSC operations"

parents 341a3b6c 39a86f74

drivers/media/platform/msm/camera/cam_icp/icp_hw/bps_hw/bps_core.c

+2 −4
Original line number Diff line number Diff line
@@ -157,11 +157,9 @@ static int cam_bps_handle_pc(struct cam_hw_info *bps_dev) 
			CAM_CPAS_REG_CPASTOP,

			hw_info->pwr_ctrl, true, 0x1);



		if ((pwr_status >> BPS_PWR_ON_MASK)) {

			CAM_ERR(CAM_ICP, "BPS: pwr_status(%x):pwr_ctrl(%x)",

		if ((pwr_status >> BPS_PWR_ON_MASK))

			CAM_WARN(CAM_ICP, "BPS: pwr_status(%x):pwr_ctrl(%x)",

				pwr_status, pwr_ctrl);

			return -EINVAL;

		}

	}

	cam_bps_get_gdsc_control(soc_info);

	cam_cpas_reg_read(core_info->cpas_handle,

drivers/media/platform/msm/camera/cam_icp/icp_hw/ipe_hw/ipe_core.c

+2 −1
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ static int cam_ipe_handle_pc(struct cam_hw_info *ipe_dev) 
			hw_info->pwr_ctrl, true, 0x1);



		if (pwr_status >> IPE_PWR_ON_MASK)

			return -EINVAL;

			CAM_WARN(CAM_ICP, "BPS: pwr_status(%x):pwr_ctrl(%x)",

				pwr_status, pwr_ctrl);



	}

	cam_ipe_get_gdsc_control(soc_info);