diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2014-07-11 15:36:00 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2014-07-11 17:08:46 +0800 |
| commit | 89401986f62b4eee21b011aa7d4b7875c7e65e34 (patch) | |
| tree | 9113a642753262b288339357ac9c8c7f891a2352 /arch | |
| parent | 8c866b9355e093bd3a285d09797ed2ef57bb3f80 (diff) | |
ENGR00321817 Reboot: System panic after suspend->resume if no hdmi in boot up
kernel panic in panic() as the cmd may be null in arm_pm_restart
panic() -- >emergency_restart() --> machine_emergency_restart() -->
machine_restart(char *cmd)/arm_pm_restart --> mxc_restart
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index b3f48f032a26..3e923f6b1cf1 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -88,9 +88,9 @@ void do_switch_fastboot(void) static void arch_reset_special_mode(char mode, const char *cmd) { #ifdef CONFIG_MXC_REBOOT_ANDROID_CMD - if (strcmp(cmd, "recovery") == 0) + if (cmd && strcmp(cmd, "recovery") == 0) do_switch_recovery(); - else if (strcmp(cmd, "fastboot") == 0) + else if (cmd && strcmp(cmd, "fastboot") == 0) do_switch_fastboot(); #endif } |