lkml.org 
[lkml]   [2008]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 46/85] ACPI: don't enable control method power button as wakeup device when Fixed Power button is used
    From: Zhang Rui <rui.zhang@intel.com>

    don't enable control method power button as wakeup device
    when Fixed Power button is used.

    http://bugzilla.kernel.org/show_bug.cgi?id=10503

    Tested-by: walken@zoy.org <walken@zoy.org>
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    drivers/acpi/scan.c | 10 ++++++++++
    1 files changed, 10 insertions(+), 0 deletions(-)

    diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
    index f6f52c1..5ce14ae 100644
    --- a/drivers/acpi/scan.c
    +++ b/drivers/acpi/scan.c
    @@ -744,6 +744,16 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
    if (!acpi_match_device_ids(device, button_device_ids))
    device->wakeup.flags.run_wake = 1;

    + /*
    + * Don't set Power button GPE as run_wake
    + * if Fixed Power button is used
    + */
    + if (!strcmp(device->pnp.hardware_id, "PNP0C0C") &&
    + !(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {
    + device->wakeup.flags.run_wake = 0;
    + device->wakeup.flags.valid = 0;
    + }
    +
    end:
    if (ACPI_FAILURE(status))
    device->flags.wake_capable = 0;
    --
    1.5.5.1


    \
     
     \ /
      Last update: 2008-10-11 08:59    [W:0.028 / U:61.936 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site