| commit | 9c18f0b7095c7981c48f41aae8abdaa06a76d9b3 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Fri Apr 24 10:42:03 2009 -0400 |
| committer | Len Brown <len.brown@intel.com> | Fri Apr 24 10:42:03 2009 -0400 |
| tree | 6b7dc4c79f232133636e444514e52fabd380ed2e | |
| parent | 3869e929bb38499b37f8cd76ec96ab6e5a169efb [diff] | |
| parent | 615dfd93e2346b604232b559e7ea0835d24abe26 [diff] |
Merge branch 'bugzilla-13142' into release
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 07c7d21..f7ca8c5 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c
@@ -1030,6 +1030,9 @@ 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];