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

Commit 665cc253 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Avoid multiple stop calls to CPAS" into dev/msm-4.9-camx

parents 88726048 2e185a4b

drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1211,10 +1211,8 @@ static int32_t cam_cci_release(struct v4l2_subdev *sd) 
	rc = cam_cci_soc_release(cci_dev);

	if (rc < 0) {

		CAM_ERR(CAM_CCI, "Failed in releasing the cci: %d", rc);

		cam_cpas_stop(cci_dev->cpas_handle);

		return rc;

	}

	cam_cpas_stop(cci_dev->cpas_handle);



	return rc;

}

drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_soc.c

+2 −0
Original line number Diff line number Diff line
@@ -392,5 +392,7 @@ int cam_cci_soc_release(struct cci_device *cci_dev) 
	cci_dev->cycles_per_us = 0;

	soc_info->src_clk_idx = 0;



	cam_cpas_stop(cci_dev->cpas_handle);



	return rc;

}