diff --git a/[refs] b/[refs] index a1ddc2f99f48..ebea04904c2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24e45bbe695719dca8c20e03d386eb6ea86526b5 +refs/heads/master: 1b7fc5aae8867046f8d3d45808309d5b7f2e036a diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 0924992187e8..5622aee996b2 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/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",