diff options
| author | Mark Lord | 2007-11-22 00:07:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2008-02-02 00:04:23 +0100 |
| commit | ecdde93962eacd9c417977a4eabd318dbb612c11 (patch) | |
| tree | 5637b661a33330cd7171f4965a7f430310dec48c /drivers/pci/hotplug/pciehp_core.c | |
| parent | PCIE: Make use of the previously split out pcie_init_enable_events() function (diff) | |
| download | kernel-qcow2-linux-ecdde93962eacd9c417977a4eabd318dbb612c11.tar.gz kernel-qcow2-linux-ecdde93962eacd9c417977a4eabd318dbb612c11.tar.xz kernel-qcow2-linux-ecdde93962eacd9c417977a4eabd318dbb612c11.zip | |
PCIe: fix double initialization bug
Earlier patches to split out the hardware init for PCIe hotplug resulted in
some one-time initializations being redone on every resume cycle. Eg.
irq/polling initialization.
This patch splits the hardware init into two parts, and separates the
one-time initializations from those so that they only ever get done once,
as intended.
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_core.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index ae3fe318b8fd..310223d037aa 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -521,7 +521,7 @@ static int pciehp_resume (struct pcie_device *dev) u8 status; /* reinitialize the chipset's event detection logic */ - pcie_init_hardware(ctrl, dev); + pcie_init_hardware_part2(ctrl, dev); t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); |