lkml.org 
[lkml]   [2008]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/37] ACPI: Fix mismerge in acpi_hibernation_finish
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    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>
    ---
    drivers/acpi/sleep/main.c | 5 -----
    1 files changed, 0 insertions(+), 5 deletions(-)

    diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
    index 2c0b663..cbfa058 100644
    --- a/drivers/acpi/sleep/main.c
    +++ b/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);

    --
    1.5.4.rc5.16.gc0279


    \
     
     \ /
      Last update: 2008-02-01 05:49    [W:2.144 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site