| Message ID | 1354189996-14431-2-git-send-email-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, 2012-11-29 at 11:53 +0000, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > ACPI_EXCEPTION() already appends a newline, so there is no > need for the failed _DCK messaged to include one too. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/acpi/dock.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c > index 88eb143..a873c6b 100644 > --- a/drivers/acpi/dock.c > +++ b/drivers/acpi/dock.c > @@ -475,7 +475,7 @@ static void handle_dock(struct dock_station *ds, int dock) > status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer); > if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) > ACPI_EXCEPTION((AE_INFO, status, "%s - failed to execute" > - " _DCK\n", (char *)name_buffer.pointer)); > + " _DCK", (char *)name_buffer.pointer)); Hi Colin, In Rafael's linux-pm tree, this message has been changed to the following. So, this patch is not necessary. if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) acpi_handle_err(ds->handle, "Failed to execute _DCK (0x%x)\n", status); Thanks, -Toshi > > kfree(buffer.pointer); > kfree(name_buffer.pointer); -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 88eb143..a873c6b 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -475,7 +475,7 @@ static void handle_dock(struct dock_station *ds, int dock) status = acpi_evaluate_object(ds->handle, "_DCK", &arg_list, &buffer); if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) ACPI_EXCEPTION((AE_INFO, status, "%s - failed to execute" - " _DCK\n", (char *)name_buffer.pointer)); + " _DCK", (char *)name_buffer.pointer)); kfree(buffer.pointer); kfree(name_buffer.pointer);