On Friday, January 11, 2013 04:36:37 AM CAI Qian wrote: > Hello Rafeal and Len, > > Please see anyone of you could ACK/NAK here in order to get this > merged into 3.0.x, 3.4,x and 3.7.x stable kernels. This has already > been merged into a Fedora kernel early to fix an user-visible issue, > https://bugzilla.redhat.com/show_bug.cgi?id=890547
I have no objections agains putting this into -stable. Thanks, Rafael > From b7e383046c2c7c13ad928cd7407eafff758ddd4b Mon Sep 17 00:00:00 2001 > From: Zhang Rui <[email protected]> > Date: Tue, 4 Dec 2012 23:23:16 +0100 > Subject: [PATCH] ACPI : do not use Lid and Sleep button for S5 wakeup > > When system enters power off, the _PSW of Lid device is enabled. > But this may cause the system to reboot instead of power off. > > A proper way to fix this is to always disable lid wakeup capability for S5. > > References: https://bugzilla.kernel.org/show_bug.cgi?id=35262 > Signed-off-by: Zhang Rui <[email protected]> > Signed-off-by: Rafael J. Wysocki <[email protected]> > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index c441834..1b888e8 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -859,8 +859,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle > handle, > static void acpi_bus_set_run_wake_flags(struct acpi_device *device) > { > struct acpi_device_id button_device_ids[] = { > - {"PNP0C0D", 0}, > {"PNP0C0C", 0}, > + {"PNP0C0D", 0}, > {"PNP0C0E", 0}, > {"", 0}, > }; > @@ -872,6 +872,11 @@ static void acpi_bus_set_run_wake_flags(struct > acpi_device *device) > /* Power button, Lid switch always enable wakeup */ > if (!acpi_match_device_ids(device, button_device_ids)) { > device->wakeup.flags.run_wake = 1; > + if (!acpi_match_device_ids(device, &button_device_ids[1])) { > + /* Do not use Lid/sleep button for S5 wakeup */ > + if (device->wakeup.sleep_state == ACPI_STATE_S5) > + device->wakeup.sleep_state = ACPI_STATE_S4; > + } > device_set_wakeup_capable(&device->dev, true); > return; > } -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
