mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'acpi-pm'
* acpi-pm: ACPI / PM: Add state information to error message in acpi_device_set_power() ACPI / PM: Remove redundant power manageable check from acpi_bus_set_power() ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere ACPI / PM: Make messages in acpi_device_set_power() print device names ACPI / PM: Only set power states of devices that are power manageable
This commit is contained in:
commit
0ad4c9a984
8 changed files with 29 additions and 33 deletions
|
|
@ -947,11 +947,11 @@ static void pata_acpi_set_state(struct ata_port *ap, pm_message_t state)
|
|||
continue;
|
||||
|
||||
acpi_bus_set_power(dev_handle, state.event & PM_EVENT_RESUME ?
|
||||
ACPI_STATE_D0 : ACPI_STATE_D3);
|
||||
ACPI_STATE_D0 : ACPI_STATE_D3_COLD);
|
||||
}
|
||||
|
||||
if (!(state.event & PM_EVENT_RESUME))
|
||||
acpi_bus_set_power(port_handle, ACPI_STATE_D3);
|
||||
acpi_bus_set_power(port_handle, ACPI_STATE_D3_COLD);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue