---

yaml
---
r: 37745
b: refs/heads/master
c: eed7d41
h: refs/heads/master
i:
  37743: 294389a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1be8924791535c5fdc6749d1f119e141baa122
+refs/heads/master: eed7d41257e2a2a38b3ad121b8948f7bfeaa21c0

trunk/arch/i386/kernel/cpu/cpufreq/longhaul.c

@@ -581,8 +581,8 @@ static int enable_arbiter_disable(void)
 	dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8601_0, NULL);
 	/* Find CLE266 host bridge */
 	if (dev == NULL) {
-		dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);
 		reg = 0x76;
+		dev = pci_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_862X_0, NULL);
 	}
 	if (dev != NULL) {
 		/* Enable access to port 0x22 */
@@ -693,25 +693,20 @@ static int __init longhaul_cpu_init(struct cpufreq_policy *policy)
 	if (longhaul_version == TYPE_POWERSAVER) {
 		/* Check ACPI support for C3 state */
 		cx = &pr->power.states[ACPI_STATE_C3];
-		if (cx->address == 0 ||
-		   (cx->latency > 1000 && ignore_latency == 0) ) {
-			if (enable_arbiter_disable()) {
-				port22_en = 1;
-			} else {
-				goto err_acpi;
-			}
+		if (cx->address > 0 &&
+		   (cx->latency <= 1000 || ignore_latency != 0) ) {
+			goto print_support_type;
 		}
-
-	} else {
-		/* Check ACPI support for bus master arbiter disable */
-		if (!pr->flags.bm_control) {
-			if (enable_arbiter_disable()) {
-				port22_en = 1;
-			} else {
-				goto err_acpi;
-			}
+	}
+	/* Check ACPI support for bus master arbiter disable */
+	if (!pr->flags.bm_control) {
+		if (enable_arbiter_disable()) {
+			port22_en = 1;
+		} else {
+			goto err_acpi;
 		}
 	}
+print_support_type:
 	if (!port22_en) {
 		printk (KERN_INFO PFX "Using ACPI support.\n");
 	} else {