From c833bc03416d3aa0d6161e2474889db7148d3c28 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 25 Nov 2010 00:06:55 +0100 Subject: [PATCH] --- yaml --- r: 230893 b: refs/heads/master c: 30d3df41b32b1ea63d3ebc52ef5644cbe41520f4 h: refs/heads/master i: 230891: be1d66c8561fa7ff25a2e8be0c5ae7317fe8a82f v: v3 --- [refs] | 2 +- trunk/drivers/acpi/internal.h | 1 + trunk/drivers/acpi/power.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a6bae88b18eb..f87c25a05c01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2ef555b57292cd818934636ac8e3414cc2a6762 +refs/heads/master: 30d3df41b32b1ea63d3ebc52ef5644cbe41520f4 diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h index 2cc01489dccf..433a8ee8ac2c 100644 --- a/trunk/drivers/acpi/internal.h +++ b/trunk/drivers/acpi/internal.h @@ -42,6 +42,7 @@ int acpi_power_init(void); int acpi_device_sleep_wake(struct acpi_device *dev, int enable, int sleep_state, int dev_state); int acpi_power_get_inferred_state(struct acpi_device *device, int *state); +int acpi_power_on_resources(struct acpi_device *device, int state); int acpi_power_transition(struct acpi_device *device, int state); extern int acpi_power_nocheck; diff --git a/trunk/drivers/acpi/power.c b/trunk/drivers/acpi/power.c index 95fedbdf4fb8..0cb4eab50d73 100644 --- a/trunk/drivers/acpi/power.c +++ b/trunk/drivers/acpi/power.c @@ -485,6 +485,14 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state) return 0; } +int acpi_power_on_resources(struct acpi_device *device, int state) +{ + if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3) + return -EINVAL; + + return acpi_power_on_list(&device->power.states[state].resources); +} + int acpi_power_transition(struct acpi_device *device, int state) { int result;