summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2015-12-15 08:37:40 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-22 02:51:41 +0100
commit76c599bcab26795b0669694e1e32a78274cb901b (patch)
tree3070c77834bdbdd0b375b62144dc51c874edae06 /drivers/acpi
parent50fe763cc8fa00bef9ff78e58645dbfdcaa998da (diff)
downloadlinux-stable-76c599bcab26795b0669694e1e32a78274cb901b.tar.gz
linux-stable-76c599bcab26795b0669694e1e32a78274cb901b.tar.bz2
linux-stable-76c599bcab26795b0669694e1e32a78274cb901b.zip
ACPI / bus: Show _OSC UUID when _OSC fails
When _OSC fails and especially when it fails due to an invalid UUID, it's helpful to show the UUID that we tried. Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/bus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 2177ef0b16e4..fcfdf6cbc6a8 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -180,9 +180,10 @@ static void acpi_print_osc_error(acpi_handle handle,
int i;
if (ACPI_FAILURE(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer)))
- printk(KERN_DEBUG "%s\n", error);
+ printk(KERN_DEBUG "%s: %s\n", context->uuid_str, error);
else {
- printk(KERN_DEBUG "%s: %s\n", (char *)buffer.pointer, error);
+ printk(KERN_DEBUG "%s (%s): %s\n",
+ (char *)buffer.pointer, context->uuid_str, error);
kfree(buffer.pointer);
}
printk(KERN_DEBUG "_OSC request data:");