projects
/
firefly-linux-kernel-4.4.55.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/roland...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
ec.c
diff --git
a/drivers/acpi/ec.c
b/drivers/acpi/ec.c
index 0924992187e87031809bf70c1b75c6367cc38a64..5622aee996b2046a788f6db842925d0dd74aad7b 100644
(file)
--- a/
drivers/acpi/ec.c
+++ b/
drivers/acpi/ec.c
@@
-194,7
+194,7
@@
static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
while (time_before(jiffies, delay)) {
if (acpi_ec_check_status(ec, event))
return 0;
-
udelay(ACPI_EC_UDELAY
);
+
msleep(1
);
}
}
pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",