4 files changed, 12 insertions, 4 deletions

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 0bda4a7f2042..e86db83746ac 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -34,6 +34,7 @@ static inline char *suspend_verb(u32 event)
         switch (event) {
         case PM_EVENT_SUSPEND:  return "suspend";
         case PM_EVENT_FREEZE:   return "freeze";
+        case PM_EVENT_PRETHAW:  return "prethaw";
         default:                return "(unknown suspend event)";
         }
 }
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)
 }
 
 /**
- *      pm_suspend_disk - The granpappy of power management.
+ *      pm_suspend_disk - The granpappy of hibernation power management.
  *
  *      If we're going through the firmware, then get it over with quickly.
  *
@@ -207,7 +207,7 @@ static int software_resume(void)
 
         pr_debug("PM: Preparing devices for restore.\n");
 
-        if ((error = device_suspend(PMSG_FREEZE))) {
+        if ((error = device_suspend(PMSG_PRETHAW))) {
                 printk("Some devices failed to suspend\n");
                 swsusp_free();
                 goto Thaw;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 17f669c83012..62752899b1a1 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -248,6 +248,9 @@ int swsusp_suspend(void)
         restore_processor_state();
 Restore_highmem:
         restore_highmem();
+        /* NOTE:  device_power_up() is just a resume() for devices
+         * that suspended with irqs off ... no overall powerup.
+         */
         device_power_up();
 Enable_irqs:
         local_irq_enable();
@@ -257,8 +260,12 @@ Enable_irqs:
 int swsusp_resume(void)
 {
         int error;
+
         local_irq_disable();
-        if (device_power_down(PMSG_FREEZE))
+        /* NOTE:  device_power_down() is just a suspend() with irqs off;
+         * it has no special "power things down" semantics
+         */
+        if (device_power_down(PMSG_PRETHAW))
                 printk(KERN_ERR "Some devices failed to power down, very bad\n");
         /* We'll ignore saved state, but this gets preempt count (etc) right */
         save_processor_state();
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 3f1539fbe48a..5a8d060d7909 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -191,7 +191,7 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
                 }
                 down(&pm_sem);
                 pm_prepare_console();
-                error = device_suspend(PMSG_FREEZE);
+                error = device_suspend(PMSG_PRETHAW);
                 if (!error) {
                         error = swsusp_resume();
                         device_resume();