Skip to content

L
linux-davinci
Commit f6139849 authored by Len Brown's avatar Len Brown
Browse files
Options

Merge branch 'power' into release

parents 3e0fe364 676962da
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
drivers/acpi/power.c
View file @ f6139849
...@@ -152,7 +152,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state) ...@@ -152,7 +152,8 @@ static int acpi_power_get_state(acpi_handle handle, int *state)
ACPI_POWER_RESOURCE_STATE_OFF; ACPI_POWER_RESOURCE_STATE_OFF;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n", 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; return 0;
} }
...@@ -515,11 +516,6 @@ int acpi_power_transition(struct acpi_device *device, int state) ...@@ -515,11 +516,6 @@ int acpi_power_transition(struct acpi_device *device, int state)
cl = &device->power.states[device->power.state].resources; cl = &device->power.states[device->power.state].resources;
tl = &device->power.states[state].resources; tl = &device->power.states[state].resources;
if (!cl->count && !tl->count) {
result = -ENODEV;
goto end;
}
/* TBD: Resources must be ordered. */ /* TBD: Resources must be ordered. */
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment