leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pci/vpd' into next

Browse Source 
* pci/vpd:
  PCI: Increase VPD access timeout to 125ms
This commit is contained in:
Bjorn Helgaas 2017-02-15 11:56:12 -06:00
commit 4c2ae32d4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/access.c
View File

@ -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;