From ce8159726183e1cbadd5ba93769c7dbfe8c682f4 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Wed, 18 Jul 2007 01:10:24 -0400 Subject: [PATCH] --- yaml --- r: 62521 b: refs/heads/master c: 9254bc845db90a123cf992e983539d0ee409f22a h: refs/heads/master i: 62519: 74c4533bfe6c4c0407200b0bbfddcf8e9f8f9dbe v: v3 --- [refs] | 2 +- trunk/drivers/acpi/dock.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dcbf0d1a44af..da46e51b886f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f8698d4d3f72252980575fb8d7b4cafeb5dd0a2 +refs/heads/master: 9254bc845db90a123cf992e983539d0ee409f22a diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index dc3df93d2310..6192c8be66df 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/drivers/acpi/dock.c @@ -396,12 +396,11 @@ static void handle_dock(struct dock_station *ds, int dock) union acpi_object arg; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer name_buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object *obj; acpi_get_name(ds->handle, ACPI_FULL_PATHNAME, &name_buffer); - obj = name_buffer.pointer; - printk(KERN_INFO PREFIX "%s\n", dock ? "docking" : "undocking"); + printk(KERN_INFO PREFIX "%s - %s\n", + (char *)name_buffer.pointer, dock ? "docking" : "undocking"); /* _DCK method has one argument */ arg_list.count = 1; @@ -410,7 +409,8 @@ static void handle_dock(struct dock_station *ds, int dock) arg.integer.value = dock; status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer); if (ACPI_FAILURE(status)) - pr_debug("%s: failed to execute _DCK\n", obj->string.pointer); + printk(KERN_ERR PREFIX "%s - failed to execute _DCK\n", + (char *)name_buffer.pointer); kfree(buffer.pointer); kfree(name_buffer.pointer); }