Fix pciehp_probe() to deal with pre-inserted ExpressCard cards, but only when pciehp_force==1. Otherwise behaviour is unmodified. Signed-off-by: Mark Lord <[email protected]> --- --- old/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-16 21:14:44.000000000 -0400 +++ linux/drivers/pci/hotplug/pciehp_ctrl.c 2007-10-16 21:16:36.000000000 -0400 @@ -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) --- old/drivers/pci/hotplug/pciehp.h 2007-10-12 12:43:44.000000000 -0400 +++ linux/drivers/pci/hotplug/pciehp.h 2007-10-16 21:16:06.000000000 -0400 @@ -161,6 +161,7 @@ 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) { --- old/drivers/pci/hotplug/pciehp_core.c 2007-10-16 21:14:44.000000000 -0400 +++ linux/drivers/pci/hotplug/pciehp_core.c 2007-10-16 21:15:56.000000000 -0400 @@ -477,7 +477,8 @@ rc = t_slot->hpc_ops->power_off_slot(t_slot); if (rc) goto err_out_free_ctrl_slot; - } + } else if (pciehp_force) + pciehp_enable_slot(t_slot); return 0; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- Re: [Pcihpd-discuss] [PATCH 2/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- From: Kristen Carlson Accardi <[email protected]>
- Re: [Pcihpd-discuss] [PATCH 2/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- From: Matthew Wilcox <[email protected]>
- [PATCH 3/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- From: Mark Lord <[email protected]>
- Re: [Pcihpd-discuss] [PATCH 2/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- References:
- PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Kristen Carlson Accardi <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Kristen Carlson Accardi <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Kristen Carlson Accardi <[email protected]>
- Re: PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Mark Lord <[email protected]>
- Re: [Pcihpd-discuss] PCIe Hotplug: NFG unless I boot with card already inserted.
- From: Greg KH <[email protected]>
- [PATCH] Fix PCIe hotplug for Dell notebook ExpressCard slots
- From: Mark Lord <[email protected]>
- [PATCH 0/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- From: Mark Lord <[email protected]>
- [PATCH 1/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- From: Mark Lord <[email protected]>
- PCIe Hotplug: NFG unless I boot with card already inserted.
- Prev by Date: [PATCH 1/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- Next by Date: [PATCH 3/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- Previous by thread: [PATCH 1/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- Next by thread: [PATCH 3/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
- Index(es):
 |