Merge branch 'pci/vpd' into next

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

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 68bd7201d8bc..b9dd37c8c9ce 100644
--- 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;