Commit 13c199c0 authored Dec 15, 2009 by Zhao Yakui Committed by Len Brown Dec 16, 2009

ACPI: Use the return result of ACPI lid notifier chain correctly

On some laptops it will return NOTIFY_OK(non-zero) when calling the ACPI LID
notifier. Then it is used as the result of ACPI LID resume function, which
will complain the following warning message in course of suspend/resume:

     >PM: Device PNP0C0D:00 failed to resume: error 1

This patch is to eliminate the above warning message.

http://bugzilla.kernel.org/show_bug.cgi?id=14782



Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 22763c5c

drivers/acpi/button.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message