diff options
| author | Lan Tianyu <tianyu.lan@intel.com> | 2013-12-12 11:08:52 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-19 15:56:15 +0100 |
| commit | 42b946bb35ef0057f13887dec5f081df0ba8840a (patch) | |
| tree | d917a35a065a508beebef4dd4bbba44eaf865663 /drivers/acpi/ec.c | |
| parent | ACPI / Button: Fix enabling button GPEs twice (diff) | |
| download | linux-42b946bb35ef0057f13887dec5f081df0ba8840a.tar.xz linux-42b946bb35ef0057f13887dec5f081df0ba8840a.zip | |
ACPI / EC: disable GPE before removing GPE handler
Adjust the order of disabling the EC GPE and removing its handler to
avoid unhandled events.
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
[rjw: Changelog]
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ba5b56db9d27..7dac048e8f07 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -779,9 +779,9 @@ static int ec_install_handlers(struct acpi_ec *ec) pr_err("Fail in evaluating the _REG object" " of EC device. Broken bios is suspected.\n"); } else { + acpi_disable_gpe(NULL, ec->gpe); acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler); - acpi_disable_gpe(NULL, ec->gpe); return -ENODEV; } } |