Merge branch 'bugzilla-14782' into release

8033c314 · Len Brown · 8fa79e08 · 13c199c0 · 8033c314
Commit 8033c314 authored Dec 16, 2009 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

drivers/acpi/button.c drivers/acpi/button.c +7 -0

No files found.
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -282,6 +282,13 @@ static int acpi_lid_send_state(struct acpi_device *device)
 	if (ret == NOTIFY_DONE)
 		ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,
 						   device);
+	if (ret == NOTIFY_DONE || ret == NOTIFY_OK) {
+		/*
+		 * It is also regarded as success if the notifier_chain
+		 * returns NOTIFY_OK or NOTIFY_DONE.
+		 */
+		ret = 0;
+	}
 	return ret;
 }