diff options
| author | Vladimir Lebedev <vladimir.p.lebedev@intel.com> | 2006-06-20 16:46:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-28 12:44:45 -0400 |
| commit | 49fee981fa98f3c0a21f3d6c8193eddcc15e84e9 (patch) | |
| tree | 203ebb3fb41dbb14ffdf2ed49f96938535e32b94 /drivers | |
| parent | 95b38b3f453c16de0f8cddcde3e71050bbfb37b9 (diff) | |
| download | linux-49fee981fa98f3c0a21f3d6c8193eddcc15e84e9.tar.gz | |
ACPI: fix battery on HP NX6125
EC problem was cause of both battery and AC issues.
http://bugzilla.kernel.org/show_bug.cgi?id=6455
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/ec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 874f912962c4b..8c5d7df7d3431 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -213,7 +213,7 @@ static int acpi_ec_intr_wait(union acpi_ec *ec, unsigned int event) switch (event) { case ACPI_EC_EVENT_IBE: - if (~acpi_ec_read_status(ec) & event) { + if (~acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF) { ec->intr.expect_event = 0; return 0; } @@ -782,12 +782,15 @@ static u32 acpi_ec_gpe_intr_handler(void *data) case ACPI_EC_EVENT_OBF: if (!(value & ACPI_EC_FLAG_OBF)) break; + ec->intr.expect_event = 0; + wake_up(&ec->intr.wait); + break; case ACPI_EC_EVENT_IBE: if ((value & ACPI_EC_FLAG_IBF)) break; ec->intr.expect_event = 0; wake_up(&ec->intr.wait); - return ACPI_INTERRUPT_HANDLED; + break; default: break; } |