diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-03 12:54:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 12:54:45 +0100 |
| commit | c36910c147fd7b129a8f1269c76b9767c99de5cd (patch) | |
| tree | 29403cd341b62581718f6b34944271980fb133e6 /drivers/acpi/ec.c | |
| parent | 70d7d357578245f1993fd2d3ccd26088bcd38941 (diff) | |
| parent | 09ee17eb8ea89514c13980c4010bdbbaea8630c2 (diff) | |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index cf41f9fc24a..30f3ef236ec 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -219,7 +219,8 @@ static void gpe_transaction(struct acpi_ec *ec, u8 status) goto unlock; err: /* false interrupt, state didn't change */ - ++ec->curr->irq_count; + if (in_interrupt()) + ++ec->curr->irq_count; unlock: spin_unlock_irqrestore(&ec->curr_lock, flags); } |