From: Mark Lord One of three patches to fix PCIe Hotplug so that it works with ExpressCard slots on Dell notebooks (and others?) in conjunction with modparam of pciehp_force=1. Fix pciehp_probe() to deal with ExpressCard cards that were inserted prior to the driver being loaded. Signed-off-by: Mark Lord Signed-off-by: Kristen Carlson Accardi Cc: Andrew Morton , Theodore Ts'o , greg@kroah.com, --- drivers/pci/hotplug/pciehp.h | 1 + drivers/pci/hotplug/pciehp_core.c | 5 +++++ drivers/pci/hotplug/pciehp_ctrl.c | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) Index: 2.6-git/drivers/pci/hotplug/pciehp_ctrl.c =================================================================== --- 2.6-git.orig/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-23 10:05:21.000000000 -0700 +++ 2.6-git/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-23 10:09:47.000000000 -0700 @@ -37,7 +37,6 @@ #include "pciehp.h" static void interrupt_event_handler(struct work_struct *work); -static int pciehp_enable_slot(struct slot *p_slot); static int pciehp_disable_slot(struct slot *p_slot); static int queue_interrupt_event(struct slot *p_slot, u32 event_type) Index: 2.6-git/drivers/pci/hotplug/pciehp.h =================================================================== --- 2.6-git.orig/drivers/pci/hotplug/pciehp.h 2007-10-23 10:05:21.000000000 -0700 +++ 2.6-git/drivers/pci/hotplug/pciehp.h 2007-10-23 10:09:47.000000000 -0700 @@ -161,6 +161,7 @@ extern int pciehp_configure_device(struc extern int pciehp_unconfigure_device(struct slot *p_slot); extern void pciehp_queue_pushbutton_work(struct work_struct *work); int pcie_init(struct controller *ctrl, struct pcie_device *dev); +int pciehp_enable_slot(struct slot *p_slot); static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) { Index: 2.6-git/drivers/pci/hotplug/pciehp_core.c =================================================================== --- 2.6-git.orig/drivers/pci/hotplug/pciehp_core.c 2007-10-23 10:05:21.000000000 -0700 +++ 2.6-git/drivers/pci/hotplug/pciehp_core.c 2007-10-23 10:09:47.000000000 -0700 @@ -471,6 +471,11 @@ static int pciehp_probe(struct pcie_devi t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */ + if (value) { + rc = pciehp_enable_slot(t_slot); + if (rc) /* -ENODEV: shouldn't happen, but deal with it */ + value = 0; + } if ((POWER_CTRL(ctrl->ctrlcap)) && !value) { rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/ if (rc)