diff --git a/[refs] b/[refs] index bf4eaeeaefe4..26558371c4e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5d191b8e531e33b823242f3d2c6b81d765e96dd +refs/heads/master: 0a918a9432cc30aede10f904253b66ea6ab485ac diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index b7d15818215c..913bb1e89dd6 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/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); }