Commit bf02bd25 authored Mar 16, 2010 by Rafael J. Wysocki Committed by Len Brown Mar 23, 2010

ACPI / ACPICA: Do not check reference counters in acpi_ev_enable_gpe()



acpi_ev_enable_gpe() should enable the GPE at the hardware level
regardless of the value of the GPE's runtime reference counter.

There are only two callers of acpi_ev_enable_gpe(), acpi_enable_gpe()
and acpi_set_gpe().  The first one checks the GPE's runtime
reference counter itself and only calls acpi_ev_enable_gpe() if it's
equal to one, and the other one is supposed to enable the GPE
unconditionally (if called with ACPI_GPE_ENABLE).

This change fixes the problem in acpi_enable_wakeup_device() where
the GPE will not be enabled for wakeup if it's runtime reference
counter is zero, which is a regression from 2.6.33.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Robert Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 7b1f513a

drivers/acpi/acpica/evgpe.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -117,19 +117,14 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
		if (ACPI_FAILURE(status))
		return_ACPI_STATUS(status);

		/* Mark wake-enabled or HW enable, or both */

		if (gpe_event_info->runtime_count) {
		/* Clear the GPE (of stale events), then enable it */
		status = acpi_hw_clear_gpe(gpe_event_info);
		if (ACPI_FAILURE(status))
		return_ACPI_STATUS(status);

		/* Enable the requested runtime GPE */
		/* Enable the requested GPE */
		status = acpi_hw_write_gpe_enable_reg(gpe_event_info);
		}

		return_ACPI_STATUS(AE_OK);
		return_ACPI_STATUS(status);
		}

		/*******************************************************************************

Admin message