Commit 964756a5 authored Nov 19, 2007 by Rafael J. Wysocki Committed by Len Brown Feb 01, 2008

ACPI: Fix mismerge in acpi_hibernation_finish

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 <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 3010f8ca

drivers/acpi/sleep/main.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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);