diff options
author | Thomas Schlichter <thomas.schlichter@web.de> | 2015-03-31 14:24:39 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-04-03 07:18:25 -0400 |
commit | c7e8bdf5872c5a8f5a6494e16fe839c38a0d3d3d (patch) | |
tree | 6be691b1d7d85b449df55e69f765302de75d6cb3 /drivers/acpi/processor_idle.c | |
parent | d75e4af14e228bbe3f86e29bcecb8e6be98d4e04 (diff) |
cpuidle: ACPI: do not overwrite name and description of C0
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>
Cc: 3.13+ <stable@vger.kernel.org> # 3.13+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-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 c6bb9f1257c9..f98db0b50551 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -922,7 +922,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) | |||
922 | return -EINVAL; | 922 | return -EINVAL; |
923 | 923 | ||
924 | drv->safe_state_index = -1; | 924 | drv->safe_state_index = -1; |
925 | for (i = 0; i < CPUIDLE_STATE_MAX; i++) { | 925 | for (i = CPUIDLE_DRIVER_STATE_START; i < CPUIDLE_STATE_MAX; i++) { |
926 | drv->states[i].name[0] = '\0'; | 926 | drv->states[i].name[0] = '\0'; |
927 | drv->states[i].desc[0] = '\0'; | 927 | drv->states[i].desc[0] = '\0'; |
928 | } | 928 | } |