git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
8fa79e0
)
Merge branch 'bugzilla-14782' into release
author
Len Brown
<len.brown@intel.com>
Wed, 16 Dec 2009 07:19:55 +0000
(
02:19
-0500)
committer
Len Brown
<len.brown@intel.com>
Wed, 16 Dec 2009 07:19:55 +0000
(
02:19
-0500)
drivers/acpi/button.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/button.c
b/drivers/acpi/button.c
index
0c9c6a9
..
8a95e83
100644
(file)
--- 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;
}