diff options
author | Mark Lord <lkml@rtr.ca> | 2007-11-21 18:07:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 18:04:23 -0500 |
commit | ecdde93962eacd9c417977a4eabd318dbb612c11 (patch) | |
tree | 5637b661a33330cd7171f4965a7f430310dec48c /drivers/pci/hotplug/pciehp.h | |
parent | cd2fe83a81510acfd1ae29b8ffe04f7ef675c993 (diff) |
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.h')
-rw-r--r-- | drivers/pci/hotplug/pciehp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index e4ad00a3448e..288fc4689103 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
@@ -163,7 +163,7 @@ extern void pciehp_queue_pushbutton_work(struct work_struct *work); | |||
163 | int pcie_init(struct controller *ctrl, struct pcie_device *dev); | 163 | int pcie_init(struct controller *ctrl, struct pcie_device *dev); |
164 | int pciehp_enable_slot(struct slot *p_slot); | 164 | int pciehp_enable_slot(struct slot *p_slot); |
165 | int pciehp_disable_slot(struct slot *p_slot); | 165 | int pciehp_disable_slot(struct slot *p_slot); |
166 | int pcie_init_hardware(struct controller *ctrl, struct pcie_device *dev); | 166 | int pcie_init_hardware_part2(struct controller *ctrl, struct pcie_device *dev); |
167 | 167 | ||
168 | static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) | 168 | static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) |
169 | { | 169 | { |