---

yaml --- r: 283351 b: refs/heads/master c: f676678 h: refs/heads/master i: 283349: 8f277d6 283347: ba0b6ce 283343: d173a59 v: v3
git-mirror · Jan 6, 2012 · f87b696 · f87b696
1 parent b39bf36
commit f87b696
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9a276ad262815d88f4dd232d578864949aab3b9
+refs/heads/master: f676678f8952d5e2bfc03903dba410c856ae3f3d
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
@@ -2613,6 +2613,10 @@ void __weak pcibios_set_master(struct pci_dev *dev)
 {
 	u8 lat;
 
+	/* The latency timer doesn't apply to PCIe (either Type 0 or Type 1) */
+	if (pci_is_pcie(dev))
+		return;
+
 	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
 	if (lat < 16)
 		lat = (64 <= pcibios_max_latency) ? 64 : pcibios_max_latency;