Commit 4c2ae32d authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/vpd' into next

* pci/vpd:
  PCI: Increase VPD access timeout to 125ms
parents 8b9c1562 4f69bd16
...@@ -367,7 +367,7 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size) ...@@ -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) static int pci_vpd_wait(struct pci_dev *dev)
{ {
struct pci_vpd *vpd = dev->vpd; 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; unsigned long max_sleep = 16;
u16 status; u16 status;
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment