diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-10 16:35:30 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-10 16:35:30 -0600 |
| commit | 5aaa71cf12f998e7073e36e8efa45d45656d9ace (patch) | |
| tree | 305f7d9f074b80415f140ffed598f71055d63a22 /drivers/pci | |
| parent | 2c1f56acb2ddf3aa273b14ebd48d61b930777e52 (diff) | |
| parent | 87683e22c646e563061a91f4a0106e6913acebf8 (diff) | |
| download | linux-3.10-5aaa71cf12f998e7073e36e8efa45d45656d9ace.tar.gz linux-3.10-5aaa71cf12f998e7073e36e8efa45d45656d9ace.tar.bz2 linux-3.10-5aaa71cf12f998e7073e36e8efa45d45656d9ace.zip | |
Merge branch 'pci/oliver-pciehp-resume' into next
* pci/oliver-pciehp-resume:
PCI: pciehp: Always implement resume, regardless of pciehp_force param
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 365c6b96c64..916bf4f53ab 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -300,24 +300,24 @@ static int pciehp_suspend (struct pcie_device *dev) static int pciehp_resume (struct pcie_device *dev) { + struct controller *ctrl; + struct slot *slot; + u8 status; + dev_info(&dev->device, "%s ENTRY\n", __func__); - if (pciehp_force) { - struct controller *ctrl = get_service_data(dev); - struct slot *slot; - u8 status; + ctrl = get_service_data(dev); - /* reinitialize the chipset's event detection logic */ - pcie_enable_notification(ctrl); + /* reinitialize the chipset's event detection logic */ + pcie_enable_notification(ctrl); - slot = ctrl->slot; + slot = ctrl->slot; - /* Check if slot is occupied */ - pciehp_get_adapter_status(slot, &status); - if (status) - pciehp_enable_slot(slot); - else - pciehp_disable_slot(slot); - } + /* Check if slot is occupied */ + pciehp_get_adapter_status(slot, &status); + if (status) + pciehp_enable_slot(slot); + else + pciehp_disable_slot(slot); return 0; } #endif /* PM */ |