projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[cascardo/linux.git]
/
drivers
/
acpi
/
ec.c
diff --git
a/drivers/acpi/ec.c
b/drivers/acpi/ec.c
index
76784ae
..
13593f9
100644
(file)
--- a/
drivers/acpi/ec.c
+++ b/
drivers/acpi/ec.c
@@
-221,6
+221,8
@@
static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
return 0;
msleep(1);
}
+ if (acpi_ec_check_status(ec,event))
+ return 0;
}
pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",
acpi_ec_read_status(ec),