From 35bbccefef7fad36104ae1e16647affa024d3918 Mon Sep 17 00:00:00 2001 From: Lan Tianyu Date: Mon, 6 May 2013 03:23:40 +0000 Subject: [PATCH] --- yaml --- r: 375709 b: refs/heads/master c: 28fe5c825f8e15744d04c7c1b8df197950923ecd h: refs/heads/master i: 375707: dbcbcd85934d9625c329dd531cbdc804c084135d v: v3 --- [refs] | 2 +- trunk/drivers/acpi/ec.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f60076fac7da..903e1afa0f2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ef366c583d6180b1c951147869ee5a3038834f2 +refs/heads/master: 28fe5c825f8e15744d04c7c1b8df197950923ecd diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index d45b2871d33b..edc00818c803 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -223,7 +223,7 @@ static int ec_check_sci_sync(struct acpi_ec *ec, u8 state) static int ec_poll(struct acpi_ec *ec) { unsigned long flags; - int repeat = 2; /* number of command restarts */ + int repeat = 5; /* number of command restarts */ while (repeat--) { unsigned long delay = jiffies + msecs_to_jiffies(ec_delay); @@ -241,8 +241,6 @@ static int ec_poll(struct acpi_ec *ec) } advance_transaction(ec, acpi_ec_read_status(ec)); } while (time_before(jiffies, delay)); - if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) - break; pr_debug(PREFIX "controller reset, restart transaction\n"); spin_lock_irqsave(&ec->lock, flags); start_transaction(ec);