diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-03 20:15:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-03 20:15:57 -0700 |
| commit | 4d578573b8328ce5aa6500b955444b89afa3c72c (patch) | |
| tree | 13b839d10dfc7e886515e2ef9e91fe7881700545 /drivers/acpi/power.c | |
| parent | Revert "mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks" (diff) | |
| parent | ACPI / PM: Make acpi_pm_device_sleep_state() follow the specification (diff) | |
| download | wireguard-linux-4d578573b8328ce5aa6500b955444b89afa3c72c.tar.xz wireguard-linux-4d578573b8328ce5aa6500b955444b89afa3c72c.zip | |
Merge branch 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull some left-over PM patches from Rafael J. Wysocki.
* 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / PM: Make acpi_pm_device_sleep_state() follow the specification
ACPI / PM: Make __acpi_bus_get_power() cover D3cold correctly
ACPI / PM: Fix error messages in drivers/acpi/bus.c
rtc-cmos / PM: report wakeup event on ACPI RTC alarm
ACPI / PM: Generate wakeup events on fixed power button
Diffstat (limited to '')
| -rw-r--r-- | drivers/acpi/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 0500f719f63e..dd6d6a3c6780 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -631,7 +631,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state) * We know a device's inferred power state when all the resources * required for a given D-state are 'on'. */ - for (i = ACPI_STATE_D0; i < ACPI_STATE_D3_HOT; i++) { + for (i = ACPI_STATE_D0; i <= ACPI_STATE_D3_HOT; i++) { list = &device->power.states[i].resources; if (list->count < 1) continue; |