Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[karo-tx-linux.git] / drivers / pci / access.c

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index db239547fefd0905b416db24b794925b816a20a9..b9dd37c8c9ce1e280ca3b0d41b0a62676a8802ca 100644 (file)
--- 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;
@@ -684,8 +684,9 @@ void pci_cfg_access_unlock(struct pci_dev *dev)
        WARN_ON(!dev->block_cfg_access);
 
        dev->block_cfg_access = 0;
-       wake_up_all(&pci_cfg_wait);
        raw_spin_unlock_irqrestore(&pci_lock, flags);
+
+       wake_up_all(&pci_cfg_wait);
 }
 EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);