aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 15:34:05 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-11 15:34:05 +0100
commitd19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch)
tree250be7a5a29069f7d1f4524fa45ab0e988833025 /drivers/acpi/power.c
parent490dea45d00f01847ebebd007685d564aaf2cd98 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index bb7d50dd281..c926e7d4a0d 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -139,6 +139,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
{
acpi_status status = AE_OK;
unsigned long long sta = 0;
+ char node_name[5];
+ struct acpi_buffer buffer = { sizeof(node_name), node_name };
if (!handle || !state)
@@ -151,8 +153,10 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
*state = (sta & 0x01)?ACPI_POWER_RESOURCE_STATE_ON:
ACPI_POWER_RESOURCE_STATE_OFF;
+ acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer);
+
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",
- acpi_ut_get_node_name(handle),
+ node_name,
*state ? "on" : "off"));
return 0;