Merge branch 'bugzilla-13142' into release

9c18f0b7 · Len Brown · 3869e929 · 615dfd93 · 9c18f0b7
Commit 9c18f0b7 authored Apr 24, 2009 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/acpi/processor_idle.c drivers/acpi/processor_idle.c +3 -0

No files found.
--- 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];