aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schlichter <thomas.schlichter@web.de>2015-03-31 20:24:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-19 10:11:08 +0200
commitc1d9552b16f62bd4683df89905bb61e14d0b6f20 (patch)
tree3afb33bf794a32fa4a8253b3808f0847aa23eefc
parent6ac0e0a446a0d07b83bd8bc09b439b7785a9f089 (diff)
downloadlinux-linaro-stable-c1d9552b16f62bd4683df89905bb61e14d0b6f20.tar.gz
cpuidle: ACPI: do not overwrite name and description of C0
commit c7e8bdf5872c5a8f5a6494e16fe839c38a0d3d3d upstream. Fix a bug that leads to showing the name and description of C-state C0 as "<null>" in sysfs after the ACPI C-states changed (e.g. after AC->DC or DC->AC transition). The function poll_idle_init() in drivers/cpuidle/driver.c initializes the state 0 during cpuidle_register_driver(), so we better do not overwrite it again with '\0' during acpi_processor_cst_has_changed(). Signed-off-by: Thomas Schlichter <thomas.schlichter@web.de> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/acpi/processor_idle.c2
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';
}