diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 08:19:55 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 08:19:55 +0100 |
| commit | 8033c314b9b67f53eddb3afcbec74c39b57b56b6 (patch) | |
| tree | 859a3f4e42eea084c584209af1a188262a140ad1 /drivers/acpi | |
| parent | Merge branch 'ost' into release (diff) | |
| parent | ACPI: Use the return result of ACPI lid notifier chain correctly (diff) | |
| download | linux-8033c314b9b67f53eddb3afcbec74c39b57b56b6.tar.xz linux-8033c314b9b67f53eddb3afcbec74c39b57b56b6.zip | |
Merge branch 'bugzilla-14782' into release
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; } |