aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-11-11 21:14:15 -0500
committerLen Brown <len.brown@intel.com>2008-11-11 21:14:15 -0500
commitf613984902b64cfb05599f9ba52c0af39cb4db6b (patch)
treed4ee7e29857dfbfc44fdf758420d906485698213
parent3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (diff)
parent676962dac6e267ce7c13f73962208f9124a084bb (diff)
Merge branch 'power' into release
-rw-r--r--drivers/acpi/power.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 81f583f8098..bb7d50dd281 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -152,7 +152,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
ACPI_POWER_RESOURCE_STATE_OFF;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",
- acpi_ut_get_node_name(handle), state ? "on" : "off"));
+ acpi_ut_get_node_name(handle),
+ *state ? "on" : "off"));
return 0;
}
@@ -515,11 +516,6 @@ int acpi_power_transition(struct acpi_device *device, int state)
cl = &device->power.states[device->power.state].resources;
tl = &device->power.states[state].resources;
- if (!cl->count && !tl->count) {
- result = -ENODEV;
- goto end;
- }
-
/* TBD: Resources must be ordered. */
/*