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

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

Merge "msm: camera : Fix for OIS and actuator power up issue" into dev/msm-4.9-camx

parents a60daaa2 8a8cd385

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c

+6 −2
Original line number Diff line number Diff line
@@ -401,12 +401,16 @@ static int32_t cam_actuator_vreg_control( 
		return -EINVAL;

	}



	if (config)

	if (config) {

		rc = cam_soc_util_request_platform_resource(soc_info,

			NULL, NULL);

		rc = cam_soc_util_enable_platform_resource(soc_info, false, 0,

			false);

	else

	} else {

		rc = cam_soc_util_release_platform_resource(soc_info);

		rc = cam_soc_util_disable_platform_resource(soc_info, false,

			false);

	}



	return rc;

}

drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_core.c

+6 −2
Original line number Diff line number Diff line
@@ -77,12 +77,16 @@ static int cam_ois_vreg_control(struct cam_ois_ctrl_t *o_ctrl, 
		return -EINVAL;

	}



	if (config)

	if (config) {

		rc = cam_soc_util_request_platform_resource(soc_info,

			NULL, NULL);

		rc = cam_soc_util_enable_platform_resource(soc_info, false, 0,

			false);

	else

	} else {

		rc = cam_soc_util_release_platform_resource(soc_info);

		rc = cam_soc_util_disable_platform_resource(soc_info, false,

			false);

	}



	return rc;

}