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

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

Merge "msm: camera: sensor: Adjust pinctrl control flow" into dev/msm-4.14-camx

parents 01ea7a7c 611df692

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c

+6 −4
Original line number Diff line number Diff line
@@ -1744,14 +1744,15 @@ int cam_sensor_core_power_up(struct cam_sensor_power_ctrl_t *ctrl, 
			ctrl->pinctrl_info.gpio_state_suspend);

		if (ret)

			CAM_ERR(CAM_SENSOR, "cannot set pin to suspend state");

		cam_res_mgr_shared_pinctrl_select_state(false);

		devm_pinctrl_put(ctrl->pinctrl_info.pinctrl);

		cam_res_mgr_shared_pinctrl_put();

	}



	if (soc_info->use_shared_clk)

		cam_res_mgr_shared_clk_config(false);



	cam_res_mgr_shared_pinctrl_select_state(false);

	cam_res_mgr_shared_pinctrl_put();



	ctrl->cam_pinctrl_status = 0;



	cam_sensor_util_request_gpio_table(soc_info, 0);
@@ -1926,14 +1927,15 @@ int cam_sensor_util_power_down(struct cam_sensor_power_ctrl_t *ctrl, 
		if (ret)

			CAM_ERR(CAM_SENSOR, "cannot set pin to suspend state");



		cam_res_mgr_shared_pinctrl_select_state(false);

		devm_pinctrl_put(ctrl->pinctrl_info.pinctrl);

		cam_res_mgr_shared_pinctrl_put();

	}



	if (soc_info->use_shared_clk)

		cam_res_mgr_shared_clk_config(false);



	cam_res_mgr_shared_pinctrl_select_state(false);

	cam_res_mgr_shared_pinctrl_put();



	ctrl->cam_pinctrl_status = 0;



	cam_sensor_util_request_gpio_table(soc_info, 0);