diff --git a/[refs] b/[refs] index 647668f1eef5..247d25a0bbf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78adb7595a9d585c60a7497345cb6eaeaaacefb +refs/heads/master: 87e753b0065f94314ebdacf6593a172cdd7839c8 diff --git a/trunk/drivers/acpi/power.c b/trunk/drivers/acpi/power.c index 089a7c39348f..6db261c237d4 100644 --- a/trunk/drivers/acpi/power.c +++ b/trunk/drivers/acpi/power.c @@ -622,12 +622,9 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state) int acpi_power_on_resources(struct acpi_device *device, int state) { - if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_COLD) + if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_HOT) return -EINVAL; - if (state == ACPI_STATE_D3_COLD) - return 0; - return acpi_power_on_list(&device->power.states[state].resources); }