PCI: latency timer doesn't apply to PCIe

[linux-2.6-block.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index f9abe84cf5e085e4f288621f9d6ddc17fab07556..5c5adef85bd70a439fedfe5d985f97fa812ba184 100644 (file)
--- a/drivers/pci/pci.c
+++ b/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;