Commit 77fb61a0 authored by Linus Torvalds's avatar Linus Torvalds

acpi: fix oops in acpi_system_wakeup_device_seq_show

Commit 0794469d: ("ACPI: struct device -
replace bus_id with dev_name(), dev_set_name()") introduced a bug by
testing 'dev_name(ldev)' instead of 'ldev->bus' for NULL when printing
out the bus information.

So if ldev->bus was NULL, we'd oops.
Reported-and-tested-by: default avatarBruno Prmont <bonbons@linux-vserver.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b42ccbc5
...@@ -366,7 +366,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset) ...@@ -366,7 +366,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
dev->wakeup.state.enabled ? "enabled" : "disabled"); dev->wakeup.state.enabled ? "enabled" : "disabled");
if (ldev) if (ldev)
seq_printf(seq, "%s:%s", seq_printf(seq, "%s:%s",
dev_name(ldev) ? ldev->bus->name : "no-bus", ldev->bus ? ldev->bus->name : "no-bus",
dev_name(ldev)); dev_name(ldev));
seq_printf(seq, "\n"); seq_printf(seq, "\n");
put_device(ldev); put_device(ldev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment