Merge tag 'pci-v6.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

[linux-block.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index d934c27491c4c61f584ba57c2a9af8aa9d6a7fb7..57ddcc59af3047970cbf143867b386cb8365ef05 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -572,7 +572,7 @@ static void pci_pm_default_resume_early(struct pci_dev *pci_dev)
 
 static void pci_pm_bridge_power_up_actions(struct pci_dev *pci_dev)
 {
-       pci_bridge_wait_for_secondary_bus(pci_dev);
+       pci_bridge_wait_for_secondary_bus(pci_dev, "resume", PCI_RESET_WAIT);
        /*
         * When powering on a bridge from D3cold, the whole hierarchy may be
         * powered on into D0uninitialized state, resume them to give them a