Merge branch 'bugzilla-14782' into release

git-mirror · Dec 16, 2009 · 8033c31 · 8033c31
2 parents 8fa79e0 + 13c199c
commit 8033c31
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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;
 }