From ecdde93962eacd9c417977a4eabd318dbb612c11 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Wed, 21 Nov 2007 15:07:55 -0800 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman --- drivers/pci/hotplug/pciehp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/pci/hotplug/pciehp_core.c') diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index ae3fe318b8f..310223d037a 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); -- cgit v1.2.3