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 2177ef0b16e4ccd07ea666045031af12d223f453..fcfdf6cbc6a88407a3b7f84db71e4f107bcc8319 100644 (file)
--- 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:");