redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'power' into release

Browse source
This commit is contained in:
Len Brown 2008-11-11 21:14:15 -05:00
parent 3e0fe36483 676962dac6
commit f613984902
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/acpi/power.c
View file

@ -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. */
/*