| Message ID | 1376606877-22482-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index ef98796..52ce767 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c @@ -311,11 +311,12 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) dev->pnp.bus_id, (u32) dev->wakeup.sleep_state); - if (!dev->physical_node_count) + if (!dev->physical_node_count) { seq_printf(seq, "%c%-8s\n", - dev->wakeup.flags.run_wake ? - '*' : ' ', "disabled"); - else { + dev->wakeup.flags.run_wake ? '*' : ' ', + device_may_wakeup(&dev->dev) ? + "enabled" : "disabled"); + } else { struct device *ldev; list_for_each_entry(entry, &dev->physical_node_list, node) {
This is a note to let you know that I have just added a patch titled ACPI / PM: Fix /proc/acpi/wakeup for devices w/o bus or parent to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue This patch is scheduled to be released in version 3.8.13.7. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.8.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From b84a4e43d41e710aba4f16d91d7977cacbd4ba98 Mon Sep 17 00:00:00 2001 From: Andreas Fleig <andreasfleig@gmail.com> Date: Sun, 27 Jan 2013 14:17:55 +0000 Subject: ACPI / PM: Fix /proc/acpi/wakeup for devices w/o bus or parent commit 65ab96f60621c4da8f1b4087a57b788bc4d8f27b upstream. Fix /proc/acpi/wakeup for devices without bus or parent This patch fixes printing the wakeup status for devices without a bus or parent, such as laptop lid switches and sleep buttons. These devices have an empty physical_node_list, because acpi_bind_one is never run for them. [rjw: White space and coding style.] Signed-off-by: Andreas Fleig <andreasfleig@gmail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> [ kamal: 3.8.y-stable prereq for 623cf33c ] Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- drivers/acpi/proc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 1.8.1.2