aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-08 17:41:57 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2011-02-24 13:58:54 -0500
commit7a63f08b2b904d25e966dd0e15c9af4a13c80b90 (patch)
tree569e6f88905fb0d6f0d32e1b35d0a6692c4eec42 /drivers
parent82911fe1988fadfc9c01673202cbc411aa803244 (diff)
ACPI / PM: Modify the "low-level resume finished" message
Move the low-level resume completion message to the point where control goes back to acpi_suspend_enter() during resume and change it so that it's more informative. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/sleep.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 3b549379801a..6bea2fe8434b 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -263,6 +263,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
263 263
264 case ACPI_STATE_S3: 264 case ACPI_STATE_S3:
265 do_suspend_lowlevel(); 265 do_suspend_lowlevel();
266 pr_info(PREFIX "Low-level resume complete\n");
266 break; 267 break;
267 } 268 }
268 269
@@ -288,8 +289,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
288 /* Allow EC transactions to happen. */ 289 /* Allow EC transactions to happen. */
289 acpi_ec_unblock_transactions_early(); 290 acpi_ec_unblock_transactions_early();
290 291
291 printk(KERN_DEBUG "Back to C!\n");
292
293 suspend_nvs_restore(); 292 suspend_nvs_restore();
294 293
295 return ACPI_SUCCESS(status) ? 0 : -EFAULT; 294 return ACPI_SUCCESS(status) ? 0 : -EFAULT;