lkml.org 
[lkml]   [2003]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] incorrect state check?
    Hi swsusp'ers...  I've been looking through some software suspend code, 
    and I think there's an error in acpi_suspend. The code is checking that
    we're trying to move into a valid state. The check now reads:

    if (state == ACPI_STATE_S2 || state == ACPI_STATE_S3 || ACPI_STATE_S4) {
    /* do stuff */
    }

    This check will always be true, since ACPI_STATE_S4 is defined to be 4.

    The attatched patch fixes this bug by putting a 'state == ' in front of
    the 'ACPI_STATE_S4'.

    Cheers!

    -Matt
    diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.5.73-vanilla/drivers/acpi/sleep/main.c linux-2.5.73-swsusp/drivers/acpi/sleep/main.c
    --- linux-2.5.73-vanilla/drivers/acpi/sleep/main.c Sun Jun 22 11:32:30 2003
    +++ linux-2.5.73-swsusp/drivers/acpi/sleep/main.c Tue Jun 24 15:58:58 2003
    @@ -238,7 +238,7 @@ acpi_suspend (
    /* do we have a wakeup address for S2 and S3? */
    /* Here, we support only S4BIOS, those we set the wakeup address */
    /* S4OS is only supported for now via swsusp.. */
    - if (state == ACPI_STATE_S2 || state == ACPI_STATE_S3 || ACPI_STATE_S4) {
    + if (state == ACPI_STATE_S2 || state == ACPI_STATE_S3 || state == ACPI_STATE_S4) {
    if (!acpi_wakeup_address)
    return AE_ERROR;
    acpi_set_firmware_waking_vector((acpi_physical_address) acpi_wakeup_address);
    \
     
     \ /
      Last update: 2005-03-22 13:36    [W:0.021 / U:29.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site