Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 241678
b: refs/heads/master
c: 7a63f08
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki committed Feb 24, 2011
1 parent b6f620a commit 126bbcb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82911fe1988fadfc9c01673202cbc411aa803244
refs/heads/master: 7a63f08b2b904d25e966dd0e15c9af4a13c80b90
3 changes: 1 addition & 2 deletions trunk/drivers/acpi/sleep.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)

case ACPI_STATE_S3:
do_suspend_lowlevel();
pr_info(PREFIX "Low-level resume complete\n");
break;
}

Expand All @@ -288,8 +289,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
/* Allow EC transactions to happen. */
acpi_ec_unblock_transactions_early();

printk(KERN_DEBUG "Back to C!\n");

suspend_nvs_restore();

return ACPI_SUCCESS(status) ? 0 : -EFAULT;
Expand Down

0 comments on commit 126bbcb

Please sign in to comment.