From 39408e6bfd81d4433025d46e457fd9cc6e2f65d1 Mon Sep 17 00:00:00 2001
From: Tim Yamin <tim.yamin@zonbu.com>
Date: Sun, 30 Mar 2008 20:58:59 +0100
Subject: [PATCH] --- yaml --- r: 91690 b: refs/heads/master c:
 bc043274560f398225dad7f0e24c6a7610d3c08a h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/pci/quirks.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a269f1e195cd..6801bd0c13cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94e6108803469a37ee1e3c92dafdd1d59298602f
+refs/heads/master: bc043274560f398225dad7f0e24c6a7610d3c08a
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index c4c769382e02..afd914ebe215 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -1648,13 +1648,24 @@ static void __devinit quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)
 			/* Turn off PCI Bus Parking */
 			pci_write_config_byte(dev, 0x76, b ^ 0x40);
 
+			dev_info(&dev->dev,
+				"Disabling VIA CX700 PCI parking\n");
+		}
+	}
+
+	if (pci_read_config_byte(dev, 0x72, &b) == 0) {
+		if (b != 0) {
 			/* Turn off PCI Master read caching */
 			pci_write_config_byte(dev, 0x72, 0x0);
+
+			/* Set PCI Master Bus time-out to "1x16 PCLK" */
 			pci_write_config_byte(dev, 0x75, 0x1);
+
+			/* Disable "Read FIFO Timer" */
 			pci_write_config_byte(dev, 0x77, 0x0);
 
 			dev_info(&dev->dev,
-				"Disabling VIA CX700 PCI parking/caching\n");
+				"Disabling VIA CX700 PCI caching\n");
 		}
 	}
 }