diff options
| author |  Feng Tang <feng.tang@intel.com>
| 2012-10-23 01:30:12 +0200 |
|---|---|---|
| committer |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2012-11-15 00:15:59 +0100 |
| commit | a3cd8d2789c2e265e09377f260e7d2ac9cec81bb (patch) | |
| tree | 14f89e7600131fcfdf7fc3ea3d436b8e51efa09b /drivers/acpi/ec.c | |
| parent | ACPI / EC: Add more debug info and trivial code cleanup (diff) | |
| download | linux-a3cd8d2789c2e265e09377f260e7d2ac9cec81bb.tar.gz linux-a3cd8d2789c2e265e09377f260e7d2ac9cec81bb.tar.bz2 linux-a3cd8d2789c2e265e09377f260e7d2ac9cec81bb.zip | |
ACPI / EC: Don't count a SCI interrupt as a false one
Currently when advance_transaction() is called in EC interrupt handler,
if there is nothing driver can do with the interrupt, it will be taken
as a false one.
But this is not always true, as there may be a SCI EC interrupt fired
during normal read/write operation, which should not be counted as a
false one. This patch fixes the problem.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 8f8b644bba8d..354007d490d1 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -198,9 +198,13 @@ static void advance_transaction(struct acpi_ec *ec, u8 status) t->done = true; goto unlock; err: - /* false interrupt, state didn't change */ - if (in_interrupt()) + /* + * If SCI bit is set, then don't think it's a false IRQ + * otherwise will take a not handled IRQ as a false one. + */ + if (in_interrupt() && !(status & ACPI_EC_FLAG_SCI)) ++t->irq_count; + unlock: spin_unlock_irqrestore(&ec->lock, flags); } |