Merge "power: reset: use hard resets by default for all restart commands" (f99d7ad5) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/power/reset/msm-poweroff.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -229,14 +229,8 @@ static void msm_restart_prepare(const char *cmd)
		#endif

		if (qpnp_pon_check_hard_reset_stored()) {
		/* Set warm reset as true when device is in dload mode
		* or device doesn't boot up into recovery, bootloader or rtc.
		*/
		if (get_dload_mode() \|\|
		((cmd != NULL && cmd[0] != '\0') &&
		strcmp(cmd, "recovery") &&
		strcmp(cmd, "bootloader") &&
		strcmp(cmd, "rtc")))
		/* Set warm reset as true when device is in dload mode */
		if (get_dload_mode())
		need_warm_reset = true;
		} else {
		need_warm_reset = (get_dload_mode() \|\|