Merge "power: reset: msm: Defer set_dload_mode to end of probe" (c068755a) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/power/reset/msm-poweroff.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -386,7 +386,6 @@ static int msm_restart_probe(struct platform_device *pdev)
		pr_err("unable to map imem EDLOAD mode offset\n");
		}

		set_dload_mode(download_mode);
		#endif
		np = of_find_compatible_node(NULL, NULL,
		"qcom,msm-imem-restart_reason");
		@@ -419,6 +418,8 @@ static int msm_restart_probe(struct platform_device *pdev)
		if (scm_is_call_available(SCM_SVC_PWR, SCM_IO_DEASSERT_PS_HOLD) > 0)
		scm_deassert_ps_hold_supported = true;

		set_dload_mode(download_mode);

		return 0;

		err_restart_reason: