Commit e0cb36a7 authored by Thomas Schlichter's avatar Thomas Schlichter Committed by Greg Kroah-Hartman

cpuidle: ACPI: do not overwrite name and description of C0

commit c7e8bdf5 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: default avatarThomas Schlichter <thomas.schlichter@web.de>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67b4228e
...@@ -962,7 +962,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) ...@@ -962,7 +962,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
return -EINVAL; return -EINVAL;
drv->safe_state_index = -1; 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].name[0] = '\0';
drv->states[i].desc[0] = '\0'; drv->states[i].desc[0] = '\0';
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment