diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /kernel/power/disk.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index 859a8e59773a..14a656cdc652 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
| @@ -391,7 +391,7 @@ int hibernation_platform_enter(void) | |||
| 391 | goto Close; | 391 | goto Close; |
| 392 | 392 | ||
| 393 | suspend_console(); | 393 | suspend_console(); |
| 394 | error = device_suspend(PMSG_SUSPEND); | 394 | error = device_suspend(PMSG_HIBERNATE); |
| 395 | if (error) | 395 | if (error) |
| 396 | goto Resume_console; | 396 | goto Resume_console; |
| 397 | 397 | ||
| @@ -404,7 +404,7 @@ int hibernation_platform_enter(void) | |||
| 404 | goto Finish; | 404 | goto Finish; |
| 405 | 405 | ||
| 406 | local_irq_disable(); | 406 | local_irq_disable(); |
| 407 | error = device_power_down(PMSG_SUSPEND); | 407 | error = device_power_down(PMSG_HIBERNATE); |
| 408 | if (!error) { | 408 | if (!error) { |
| 409 | hibernation_ops->enter(); | 409 | hibernation_ops->enter(); |
| 410 | /* We should never get here */ | 410 | /* We should never get here */ |