svn commit: r238192 - head/sys/dev/acpica

[Andriy Gapon]

Author: avg
Date: Sat Jul  7 07:59:14 2012
New Revision: 238192
URL: http://svn.freebsd.org/changeset/base/238192

Log:
  acpi_cpu_cx_cst: consistently use cpu_cx_count during state enumeration
  
  cpu_cx_count is an index into accepted states, while i is an index into
  original _CST states
  
  MFC after:	1 week

Modified:
  head/sys/dev/acpica/acpi_cpu.c

Modified: head/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- head/sys/dev/acpica/acpi_cpu.c	Sat Jul  7 05:25:22 2012	(r238191)
+++ head/sys/dev/acpica/acpi_cpu.c	Sat Jul  7 07:59:14 2012	(r238192)
@@ -746,13 +746,13 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *s
 		/* This is the first C1 state.  Use the reserved slot. */
 		sc->cpu_cx_states[0] = *cx_ptr;
 	    } else {
-		sc->cpu_non_c3 = i;
+		sc->cpu_non_c3 = sc->cpu_cx_count;
 		cx_ptr++;
 		sc->cpu_cx_count++;
 	    }
 	    continue;
 	case ACPI_STATE_C2:
-	    sc->cpu_non_c3 = i;
+	    sc->cpu_non_c3 = sc->cpu_cx_count;
 	    break;
 	case ACPI_STATE_C3:
 	default: