From: Andy Lutomirski <luto@kernel.org>
Date: Tue, 15 Dec 2015 16:37:40 +0000 (-0800)
Subject: ACPI / bus: Show _OSC UUID when _OSC fails
X-Git-Tag: v4.5-rc1~125^2~9^3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76c599bcab26795b0669694e1e32a78274cb901b;p=thirdparty%2Flinux.git

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>
---

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 2177ef0b16e4c..fcfdf6cbc6a88 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:");