diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2009-10-01 18:53:15 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-10-02 10:00:31 -0400 |
commit | e12ac3d018dd8f20a075f5520209862969146fa6 (patch) | |
tree | bce2e5ed47d587ca6ca06963c3c3652d024fbea9 /drivers/acpi | |
parent | 0efe5e32c8729ef44b00d9a7203e4c99a6378b27 (diff) |
ACPI: EC: Restart command even if no interrupts from EC
EC may forget a command without sending any "reset" interrupt,
thus we need to lessen the requirement for transaction restart.
Reference: http://bugzilla.kernel.org/show_bug.cgi?id=14247
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/ec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index f70796081c4c..8a4897d3899d 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -232,10 +232,8 @@ static int ec_poll(struct acpi_ec *ec) | |||
232 | } | 232 | } |
233 | advance_transaction(ec, acpi_ec_read_status(ec)); | 233 | advance_transaction(ec, acpi_ec_read_status(ec)); |
234 | } while (time_before(jiffies, delay)); | 234 | } while (time_before(jiffies, delay)); |
235 | if (!ec->curr->irq_count || | 235 | if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) |
236 | (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)) | ||
237 | break; | 236 | break; |
238 | /* try restart command if we get any false interrupts */ | ||
239 | pr_debug(PREFIX "controller reset, restart transaction\n"); | 237 | pr_debug(PREFIX "controller reset, restart transaction\n"); |
240 | spin_lock_irqsave(&ec->curr_lock, flags); | 238 | spin_lock_irqsave(&ec->curr_lock, flags); |
241 | start_transaction(ec); | 239 | start_transaction(ec); |