aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2011-06-01 23:54:02 +0800
committerLen Brown <len.brown@intel.com>2011-07-13 23:53:22 -0400
commitb4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d (patch)
tree3bee07efb713e740f631f00e22989c7be1161c91
parent8d86e5f91440aa56a5df516bf58fe3883552ad56 (diff)
downloadkernel_samsung_smdk4412-b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d.zip
kernel_samsung_smdk4412-b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d.tar.gz
kernel_samsung_smdk4412-b4a03b9aa96cc186bf3cfd7a55cb7d7227f0cf4d.tar.bz2
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>
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 3a10ef5..6cd5b64 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 */