ACPI / EC: Fix unexpected ec_remove_handlers() invocations

Lv Zheng · rafaeljw · commit 1741acea75ea · 2014-12-15T15:10:23.000+01:00
The ec_remove_handlers() is invoked without checking
EC_FLAGS_HANDLERS_INSTALLED, this patch enhances this check to avoid issues
that acpi_disable_gpe() is invoked unexpectedly to reduce the GPE runtime
count. This may happen when the EC handler installation failed on some
platforms.

Reported-by: Venkat Raghavulu &lt;venkat.raghavulu@intel.com&gt;
Signed-off-by: Lv Zheng &lt;lv.zheng@intel.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git 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)))

Original file line number	Diff line number	Diff line change
`@@ -844,6 +844,8 @@ static int ec_install_handlers(struct acpi_ec *ec)`
`844`	`844`
`845`	`845`	`static void ec_remove_handlers(struct acpi_ec *ec)`
`846`	`846`	`{`
	`847`	`+ if (!test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))`
	`848`	`+ return;`
`847`	`849`	`acpi_disable_gpe(NULL, ec->gpe);`
`848`	`850`	`if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,`
`849`	`851`	`ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))`