aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/disk.c
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-08-15 02:11:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-26 00:08:37 -0400
commitf1cc0a894c963923b766eb2d455747495e6e982d (patch)
treecccd3a2c337f0117d664e204eedf5c222a6c43f7 /kernel/power/disk.c
parent185849991d592497e43bcd264c6152af1261ffe2 (diff)
PM: issue PM_EVENT_PRETHAW
This patch is the first of this series that should actually change any behavior ... by issuing the new event, now tha the rest of the kernel is prepared to receive it. This converts the PM core to issue the new PRETHAW message, which the rest of the kernel is now ready to receive. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/power/disk.c')
-rw-r--r--kernel/power/disk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index e13e74067845..a3c34fb14321 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -98,7 +98,7 @@ static void unprepare_processes(void)
98} 98}
99 99
100/** 100/**
101 * pm_suspend_disk - The granpappy of power management. 101 * pm_suspend_disk - The granpappy of hibernation power management.
102 * 102 *
103 * If we're going through the firmware, then get it over with quickly. 103 * If we're going through the firmware, then get it over with quickly.
104 * 104 *
@@ -207,7 +207,7 @@ static int software_resume(void)
207 207
208 pr_debug("PM: Preparing devices for restore.\n"); 208 pr_debug("PM: Preparing devices for restore.\n");
209 209
210 if ((error = device_suspend(PMSG_FREEZE))) { 210 if ((error = device_suspend(PMSG_PRETHAW))) {
211 printk("Some devices failed to suspend\n"); 211 printk("Some devices failed to suspend\n");
212 swsusp_free(); 212 swsusp_free();
213 goto Thaw; 213 goto Thaw;