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

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

Merge "msm: camera: util: Disable IRQ before clocks" into dev/msm-4.9-camx

parents 7f67a417 b6f6137a

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.c

+3 −3
Original line number Diff line number Diff line
@@ -1355,14 +1355,14 @@ int cam_soc_util_disable_platform_resource(struct cam_hw_soc_info *soc_info, 
	if (!soc_info)

		return -EINVAL;



	if (disble_irq)

		rc |= cam_soc_util_irq_disable(soc_info);



	if (disable_clocks)

		cam_soc_util_clk_disable_default(soc_info);



	cam_soc_util_regulator_disable_default(soc_info);



	if (disble_irq)

		rc |= cam_soc_util_irq_disable(soc_info);



	if (soc_info->pinctrl_info.pinctrl &&

		soc_info->pinctrl_info.gpio_state_suspend)

		rc = pinctrl_select_state(soc_info->pinctrl_info.pinctrl,