ACPI: Fix mismerge in acpi_hibernation_finish

PATCH New Rafael J. Wysocki 1 participant 1 message Nov 1, 2007 ACPI

lore

Share & tools

lore

Rafael J. Wysocki

author

2007-11-01 22:33 UTC #0 lore raw

PATCH 1/1 ACPI: Fix mismerge in acpi_hibernation_finish

[Len, please send Linuswards.]
---
From: Rafael J. Wysocki <[email protected]>

Some code in acpi_hibernation_finish() was moved to acpi_hibernation_leave(), but the old copy had been left (it's harmless, but also useless). Remove it.

Signed-off-by Rafael J. Wysocki <[email protected]>

---
 drivers/acpi/sleep/main.c |    5 -----
 1 file changed, 5 deletions(-)

drivers/acpi/sleep/main.c +0 -5

Index: linux-2.6/drivers/acpi/sleep/main.c
===================================================================
@@ -267,11 +267,6 @@ static void acpi_hibernation_leave(void)
 
 static void acpi_hibernation_finish(void)
 {
-	/*
-	 * If ACPI is not enabled by the BIOS and the boot kernel, we need to
-	 * enable it here.
-	 */
-	acpi_enable();
 	acpi_disable_wakeup_device(ACPI_STATE_S4);
 	acpi_leave_sleep_state(ACPI_STATE_S4);