浏览代码

Merge branch 'bugzilla-14782' into release

Len Brown 16 年之前
父节点
当前提交
8033c314b9
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      drivers/acpi/button.c

+ 7 - 0
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;
 }