Merge branch 'bugzilla-13142' into release

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 07c7d216c89d2aef4586bce090bcc7842911720c..f7ca8c55956bdce81732c4b0cfcf40bf82704fb6 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1030,6 +1030,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                dev->states[i].desc[0] = '\0';
        }
 
+       if (max_cstate == 0)
+               max_cstate = 1;
+
        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
                cx = &pr->power.states[i];
                state = &dev->states[count];