diff options
| author | Andreas Fleig <andreasfleig@gmail.com> | 2013-01-27 14:17:55 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-27 21:40:11 +0100 |
| commit | 65ab96f60621c4da8f1b4087a57b788bc4d8f27b (patch) | |
| tree | 0bdc700c08ff7977c3850b97fba82401e5dc4221 /drivers/acpi/proc.c | |
| parent | 660b1113e0f33a476952cb2cbcb5c9831e7ff4cd (diff) | |
| download | blackbird-op-linux-65ab96f60621c4da8f1b4087a57b788bc4d8f27b.tar.gz blackbird-op-linux-65ab96f60621c4da8f1b4087a57b788bc4d8f27b.zip | |
ACPI / PM: Fix /proc/acpi/wakeup for devices w/o bus or parent
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>
Diffstat (limited to 'drivers/acpi/proc.c')
| -rw-r--r-- | drivers/acpi/proc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index ef98796b3824..52ce76725c20 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) { |
