diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2009-12-15 22:01:57 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-06 15:03:30 -0800 |
| commit | 8aafd7d4acb527c3dfd95d24af190528cc58326b (patch) | |
| tree | 4dcfc61d171480336c5be53ee6a21b69d8410354 /drivers/acpi | |
| parent | 3872bf59ad0d88c81d7fb70ac86a5fc2f8aa6d34 (diff) | |
ACPI: Use the return result of ACPI lid notifier chain correctly
commit 13c199c0d0cf78b27592991129fb8cbcfc5164de upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/button.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 0c9c6a9a002c..8a95e8329df7 100644 --- 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; } |