Merge branch 'pci/vpd' into next

* pci/vpd: PCI: Increase VPD access timeout to 125ms

Merge branch 'pci/vpd' into next
* pci/vpd: PCI: Increase VPD access timeout to 125ms
4c2ae32d · Bjorn Helgaas · 8b9c1562 · 4f69bd16 · 4c2ae32d
Commit 4c2ae32d authored Feb 15, 2017 by Bjorn Helgaas
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/pci/access.c drivers/pci/access.c +1 -1

No files found.
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -367,7 +367,7 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size)
 static int pci_vpd_wait(struct pci_dev *dev)
 {
 	struct pci_vpd *vpd = dev->vpd;
-	unsigned long timeout = jiffies + msecs_to_jiffies(50);
+	unsigned long timeout = jiffies + msecs_to_jiffies(125);
 	unsigned long max_sleep = 16;
 	u16 status;
 	int ret;