Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5f9b74b9b71f0a9a6ad2ba4243ceab58c57ff69b..1b5853f384e268f7efd7928f13d929376094a9a5 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -844,6 +844,8 @@ static int ec_install_handlers(struct acpi_ec *ec)
 
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
+       if (!test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
+               return;
        acpi_disable_gpe(NULL, ec->gpe);
        if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))