Merge branch 'bugzilla-13142' into release

git-mirror · Apr 24, 2009 · 9c18f0b · 9c18f0b
2 parents 3869e92 + 615dfd9
commit 9c18f0b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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];