applied to acpi-test. thanks, -len On Fri, 12 Sep 2008, Zhang Rui wrote: > 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@xxxxxxx <walken@xxxxxxx> > Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx> > --- > drivers/acpi/scan.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > Index: linux-2.6/drivers/acpi/scan.c > =================================================================== > --- linux-2.6.orig/drivers/acpi/scan.c 2008-09-11 13:28:11.000000000 +0800 > +++ linux-2.6/drivers/acpi/scan.c 2008-09-11 15:12:12.000000000 +0800 > @@ -744,6 +744,16 @@ > 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; > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
