From 69c5effef6f46bf53766212279e4ed0f23c960ed Mon Sep 17 00:00:00 2001 From: Matt Wagantall Date: Thu, 13 Aug 2015 10:25:57 -0700 Subject: [PATCH] power: reset: use hard resets by default for all restart commands Present, hard resets are used only when rebooting for "recovery", "rtc", or "bootload" reboot commands or when the reboot command is an empty string. Perform hard resets for invalid reboot commands also, to avoid accidental warm resets if an invalid reboot command is mistakenly used. Continue to use warm resets for entry into download mode. This is required for collection of ramdumps. Change-Id: I71f657e9c8c20abcbbda86d789c843060c8ffce7 Signed-off-by: Matt Wagantall --- drivers/power/reset/msm-poweroff.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 14183807309d..b70dfb5fb6d4 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -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() ||