From: Thomas Renninger Date: Sat, 11 Oct 2008 04:15:04 +0000 (-0400) Subject: Subject: ACPI dock: Use ACPI_EXCEPTION instead of printk(KERN_ERR X-Git-Tag: v2.6.28-rc1~26^2~20^2 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=0a918a9432cc30aede10f904253b66ea6ab485ac;p=linux-2.6-omap-h63xx.git Subject: ACPI dock: Use ACPI_EXCEPTION instead of printk(KERN_ERR lenb: stripped patch down to what still applied to new dock.c Signed-off-by: Thomas Renninger Signed-off-by: Len Brown --- diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index b7d15818215..913bb1e89dd 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -488,8 +488,9 @@ 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) && status != AE_NOT_FOUND) - printk(KERN_ERR PREFIX "%s - failed to execute _DCK\n", - (char *)name_buffer.pointer); + ACPI_EXCEPTION((AE_INFO, status, "%s - failed to execute" + " _DCK\n", (char *)name_buffer.pointer)); + kfree(buffer.pointer); kfree(name_buffer.pointer); }