diff options
| -rw-r--r-- | drivers/power/reset/msm-poweroff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 7596e8c3c82e..14183807309d 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -228,9 +228,6 @@ static void msm_restart_prepare(const char *cmd) (in_panic || restart_mode == RESTART_DLOAD)); #endif - need_warm_reset = (get_dload_mode() || - (cmd != NULL && cmd[0] != '\0')); - 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. @@ -241,6 +238,9 @@ static void msm_restart_prepare(const char *cmd) strcmp(cmd, "bootloader") && strcmp(cmd, "rtc"))) need_warm_reset = true; + } else { + need_warm_reset = (get_dload_mode() || + (cmd != NULL && cmd[0] != '\0')); } /* Hard reset the PMIC unless memory contents must be maintained. */ |