evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drivers: power: reset: Do warm reset when device reboot to edl"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-18 12:04:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit 01f2f44101
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/power/reset/msm-poweroff.c
View file

@ -1,4 +1,4 @@
/* 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -230,7 +230,9 @@ static void msm_restart_prepare(const char *cmd)
if (qpnp_pon_check_hard_reset_stored()) { if (qpnp_pon_check_hard_reset_stored()) {
/* Set warm reset as true when device is in dload mode */ /* 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; need_warm_reset = true;
} else { } else {
need_warm_reset = (get_dload_mode() || need_warm_reset = (get_dload_mode() ||