diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-11-11 04:54:11 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-11-11 18:35:58 -0500 |
commit | 8517934ef6aaa28d6e055b98df65b31cedbd1372 (patch) | |
tree | dc3588e491f4b148f21d134788397a3b1376182d /drivers/acpi | |
parent | 06cf7d3c7af902939cd1754abcafb2464060cba8 (diff) |
ACPI: EC: Don't do transaction from GPE handler in poll mode.
Referencies: http://bugzilla.kernel.org/show_bug.cgi?id=12004
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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ab84f99f1369..bd1af3e9e4ce 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -581,9 +581,12 @@ static u32 acpi_ec_gpe_handler(void *data) | |||
581 | pr_debug(PREFIX "~~~> interrupt\n"); | 581 | pr_debug(PREFIX "~~~> interrupt\n"); |
582 | status = acpi_ec_read_status(ec); | 582 | status = acpi_ec_read_status(ec); |
583 | 583 | ||
584 | gpe_transaction(ec, status); | 584 | if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) { |
585 | if (ec_transaction_done(ec) && (status & ACPI_EC_FLAG_IBF) == 0) | 585 | gpe_transaction(ec, status); |
586 | wake_up(&ec->wait); | 586 | if (ec_transaction_done(ec) && |
587 | (status & ACPI_EC_FLAG_IBF) == 0) | ||
588 | wake_up(&ec->wait); | ||
589 | } | ||
587 | 590 | ||
588 | ec_check_sci(ec, status); | 591 | ec_check_sci(ec, status); |
589 | if (!test_bit(EC_FLAGS_GPE_MODE, &ec->flags) && | 592 | if (!test_bit(EC_FLAGS_GPE_MODE, &ec->flags) && |