diff options
author | Lin Ming <ming.m.lin@intel.com> | 2011-06-01 17:54:02 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-07-14 05:53:22 +0200 |
commit | b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d (patch) | |
tree | 3bee07efb713e740f631f00e22989c7be1161c91 /include/acpi | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
download | linux-b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d.tar.xz linux-b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d.zip |
ACPI: Fixes device power states array overflow
Commit 28c2103 added new state ACPI_STATE_D3_COLD, so the device power
states array must be expanded by one also.
v2: Use ACPI_D_STATE_COUNT instead of number 5 for the array size.
Reported-by: Dan Carpenter <error27@gmail.com>
Suggested-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 3a10ef5914eb..6cd5b6403a7b 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -210,7 +210,7 @@ struct acpi_device_power_state { struct acpi_device_power { int state; /* Current state */ struct acpi_device_power_flags flags; - struct acpi_device_power_state states[4]; /* Power states (D0-D3) */ + struct acpi_device_power_state states[ACPI_D_STATE_COUNT]; /* Power states (D0-D3Cold) */ }; /* Performance Management */ |