Merge "drivers: power: reset: Do warm reset when device reboot to edl" (e92c35e5) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/reset/msm-poweroff.c

+4 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -262,7 +262,9 @@ static void msm_restart_prepare(const char *cmd)

		if (qpnp_pon_check_hard_reset_stored()) {
		/* Set warm reset as true when device is in dload mode */
		if (get_dload_mode())
		if (get_dload_mode() \|\|
		((cmd != NULL && cmd[0] != '\0') &&
		!strcmp(cmd, "edl")))
		need_warm_reset = true;
		} else {
		need_warm_reset = (get_dload_mode() \|\|