瀏覽代碼

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>
Rafael J. Wysocki 17 年之前
父節點
當前提交
964756a52f
共有 1 個文件被更改,包括 0 次插入5 次删除
  1. 0 5
      drivers/acpi/sleep/main.c

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

@@ -267,11 +267,6 @@ static void acpi_hibernation_leave(void)
 
 
 static void acpi_hibernation_finish(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_disable_wakeup_device(ACPI_STATE_S4);
 	acpi_leave_sleep_state(ACPI_STATE_S4);
 	acpi_leave_sleep_state(ACPI_STATE_S4);