Commit 5aaa71cf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/oliver-pciehp-resume' into next 

* pci/oliver-pciehp-resume:
  PCI: pciehp: Always implement resume, regardless of pciehp_force param
parents 2c1f56ac 87683e22

drivers/pci/hotplug/pciehp_core.c

+14 −14
Original line number Diff line number Diff line
@@ -300,12 +300,13 @@ static int pciehp_suspend (struct pcie_device *dev) 


static int pciehp_resume (struct pcie_device *dev)

{

	dev_info(&dev->device, "%s ENTRY\n", __func__);

	if (pciehp_force) {

		struct controller *ctrl = get_service_data(dev);

	struct controller *ctrl;

	struct slot *slot;

	u8 status;



	dev_info(&dev->device, "%s ENTRY\n", __func__);

	ctrl = get_service_data(dev);



	/* reinitialize the chipset's event detection logic */

	pcie_enable_notification(ctrl);
@@ -317,7 +318,6 @@ static int pciehp_resume (struct pcie_device *dev) 
		pciehp_enable_slot(slot);

	else

		pciehp_disable_slot(slot);

	}

	return 0;

}

#endif /* PM */