Merge tag 'pci-v4.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[mirror_ubuntu-artful-kernel.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index df4aead394f29436027c46d5148fdcb0b4180759..607f677f48d21f7b7f1b938ec39c11034c4dac17 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -415,6 +415,8 @@ static int pci_device_probe(struct device *dev)
        struct pci_dev *pci_dev = to_pci_dev(dev);
        struct pci_driver *drv = to_pci_driver(dev->driver);
 
+       pci_assign_irq(pci_dev);
+
        error = pcibios_alloc_irq(pci_dev);
        if (error < 0)
                return error;
@@ -967,6 +969,7 @@ static int pci_pm_thaw_noirq(struct device *dev)
                return pci_legacy_resume_early(dev);
 
        pci_update_current_state(pci_dev, PCI_D0);
+       pci_restore_state(pci_dev);
 
        if (drv && drv->pm && drv->pm->thaw_noirq)
                error = drv->pm->thaw_noirq(dev);