summaryrefslogtreecommitdiff
path: root/drivers/acpi/button.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-02-17 23:41:49 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-02-22 16:20:51 -0800
commitf517709d65beed95f52f021b43e3035b52ef791a (patch)
treedd814cb7dc6b211fc6c31cadab1b77c12c137775 /drivers/acpi/button.c
parent9630bdd9b15d2f489c646d8bc04b60e53eb5ec78 (diff)
downloadlinux-3.10-f517709d65beed95f52f021b43e3035b52ef791a.tar.gz
linux-3.10-f517709d65beed95f52f021b43e3035b52ef791a.tar.bz2
linux-3.10-f517709d65beed95f52f021b43e3035b52ef791a.zip
ACPI / PM: Add more run-time wake-up fields
Use the run_wake flag to mark all devices for which run-time wake-up events may be generated by the platform. Introduce a new wake-up flag, always_enabled, for marking devices that should be permanently enabled to generate run-time events. Also, introduce a reference counter for run-wake devices and a function that will initialize all of the run-time wake-up fields for given device. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Len Brown <len.brown@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/acpi/button.c')
-rw-r--r--drivers/acpi/button.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 09ca3ce7a05..f53fbe307c9 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -425,6 +425,7 @@ static int acpi_button_add(struct acpi_device *device)
acpi_enable_gpe(device->wakeup.gpe_device,
device->wakeup.gpe_number,
ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.run_wake_count++;
device->wakeup.state.enabled = 1;
}
@@ -448,6 +449,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
acpi_disable_gpe(device->wakeup.gpe_device,
device->wakeup.gpe_number,
ACPI_GPE_TYPE_WAKE_RUN);
+ device->wakeup.run_wake_count--;
device->wakeup.state.enabled = 0;
}