diff options
| author | Sebastian Reichel <sre@kernel.org> | 2014-09-26 13:45:11 -0400 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-09-26 13:45:11 -0400 |
| commit | 1670d8569eeb5c5c15776d37b00a2afb5255bf28 (patch) | |
| tree | 874ed86799a9f7a256087c1138c7af35f7f1e9a1 /drivers/power | |
| parent | b08fec2262c8dbb349fe9456586cf0724407e5ee (diff) | |
| parent | 6cd6d94d96d9b1cd8a62da91aac44cf56e301e75 (diff) | |
Merge tag 'tags/restart-handler-for-v3.18' into next
Immutable branch with restart handler patches for v3.18
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/restart-poweroff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index 3e51f8d29bfe..edd707ee7281 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c | |||
| @@ -20,7 +20,8 @@ | |||
| 20 | 20 | ||
| 21 | static void restart_poweroff_do_poweroff(void) | 21 | static void restart_poweroff_do_poweroff(void) |
| 22 | { | 22 | { |
| 23 | arm_pm_restart(REBOOT_HARD, NULL); | 23 | reboot_mode = REBOOT_HARD; |
| 24 | machine_restart(NULL); | ||
| 24 | } | 25 | } |
| 25 | 26 | ||
| 26 | static int restart_poweroff_probe(struct platform_device *pdev) | 27 | static int restart_poweroff_probe(struct platform_device *pdev) |