Merge "power: reset: Don't set dload_mode in kdump kernel" (4cbea41c) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/power/reset/msm-poweroff.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <linux/input/qpnp-power-on.h>
		#include <linux/of_address.h>
		#include <linux/syscore_ops.h>
		#include <linux/crash_dump.h>

		#include <asm/cacheflush.h>
		#include <asm/system_misc.h>
		@@ -292,7 +293,7 @@ static void msm_restart_prepare(const char *cmd)
		* Write download mode flags if restart_mode says so
		* Kill download mode if master-kill switch is set
		*/

		if (!is_kdump_kernel())
		set_dload_mode(download_mode &&
		(in_panic \|\| restart_mode == RESTART_DLOAD));
		#endif
		@@ -694,7 +695,7 @@ 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;

		if (!is_kdump_kernel())
		set_dload_mode(download_mode);
		if (!download_mode)
		scm_disable_sdi();