diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:12 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:12 -0600 |
| commit | 4c2ae32d4c6ccd63819f36702f8455a5b08eaca8 (patch) | |
| tree | 8e17d472a0b714fb5798ebbfaaa60f45e6d5b7ec /drivers/pci/access.c | |
| parent | 8b9c156262f9ebaa88736b93263c1af5ae5fa43e (diff) | |
| parent | 4f69bd16df1a38c32d5d207a96d1d86df4808f87 (diff) | |
| download | linux-4c2ae32d4c6ccd63819f36702f8455a5b08eaca8.tar.bz2 | |
Merge branch 'pci/vpd' into next
* pci/vpd:
PCI: Increase VPD access timeout to 125ms
Diffstat (limited to 'drivers/pci/access.c')
| -rw-r--r-- | drivers/pci/access.c | 2 |
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; |