diff options
| author | Mark Lord | 2007-11-29 00:12:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2008-02-02 00:04:23 +0100 |
| commit | cd2fe83a81510acfd1ae29b8ffe04f7ef675c993 (patch) | |
| tree | d445b9d21069284f782df86b097c687a4ff6d46c /drivers/pci/hotplug/pciehp_ctrl.c | |
| parent | PCI: more fixes for PCIe Hotplug so that it works with ExpressCard slots on D... (diff) | |
| download | kernel-qcow2-linux-cd2fe83a81510acfd1ae29b8ffe04f7ef675c993.tar.gz kernel-qcow2-linux-cd2fe83a81510acfd1ae29b8ffe04f7ef675c993.tar.xz kernel-qcow2-linux-cd2fe83a81510acfd1ae29b8ffe04f7ef675c993.zip | |
PCIE: Make use of the previously split out pcie_init_enable_events() function
Make use of the previously split out pcie_init_enable_events() function
to reinitialize the hotplug hardware on resume from suspend, but only
when pciehp_force==1. Otherwise behaviour is unmodified.
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_ctrl.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 342cfc6c1de8..e5eb9106e7be 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -37,7 +37,6 @@ #include "pciehp.h" static void interrupt_event_handler(struct work_struct *work); -static int pciehp_disable_slot(struct slot *p_slot); static int queue_interrupt_event(struct slot *p_slot, u32 event_type) { |