diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
commit | 663276faa26c2837eca83a5800b3668be19aaaff (patch) | |
tree | aee6a1964c83eb2153bde4a4c442af88204a28a8 /drivers/acpi | |
parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
parent | 5c43c539346972b9a1d5f38dc62db5a39997488d (diff) |
Merge tag 'v3.14.39' into linux-linaro-lsk-v3.14
This is the 3.14.39 stable release
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/processor_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 17f9ec501972..fd8496a92b45 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -962,7 +962,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) return -EINVAL; drv->safe_state_index = -1; - for (i = 0; i < CPUIDLE_STATE_MAX; i++) { + for (i = CPUIDLE_DRIVER_STATE_START; i < CPUIDLE_STATE_MAX; i++) { drv->states[i].name[0] = '\0'; drv->states[i].desc[0] = '\0'; } |