Merge branch 'power' into release
This commit is contained in:
Коммит
f613984902
|
@ -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. */
|
||||
|
||||
/*
|
||||
|
|
Загрузка…
Ссылка в новой задаче