Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b52e2a6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
parents bec41d5b 994e0b2c

drivers/pci/hotplug/pciehp_acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static struct pcie_port_service_driver __initdata dummy_driver = { 
static int __init select_detection_mode(void)

{

	struct dummy_slot *slot, *tmp;

	pcie_port_service_register(&dummy_driver);

	if (pcie_port_service_register(&dummy_driver))

		return PCIEHP_DETECT_ACPI;

	pcie_port_service_unregister(&dummy_driver);

	list_for_each_entry_safe(slot, tmp, &dummy_slots, list) {

		list_del(&slot->list);