Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'pci/vpd' into next 

* pci/vpd:
  PCI: Increase VPD access timeout to 125ms
parents 8b9c1562 4f69bd16

drivers/pci/access.c

+1 −1
Original line number Diff line number Diff line
@@ -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;