diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-28 11:23:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-28 11:23:50 -0800 |
| commit | b52e2a6d6d05421dea6b6a94582126af8cd5cca2 (patch) | |
| tree | e595ebd22ddd609fdbeb15c889b495eb1cebdd40 | |
| parent | bec41d5b8417ccb98e4752affa24e1dc563d99f9 (diff) | |
| parent | 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf (diff) | |
| download | linux-3.10-b52e2a6d6d05421dea6b6a94582126af8cd5cca2.tar.gz linux-3.10-b52e2a6d6d05421dea6b6a94582126af8cd5cca2.tar.bz2 linux-3.10-b52e2a6d6d05421dea6b6a94582126af8cd5cca2.zip | |
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
| -rw-r--r-- | drivers/pci/hotplug/pciehp_acpi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c index 2574700db46..5f7226223a6 100644 --- a/drivers/pci/hotplug/pciehp_acpi.c +++ b/drivers/pci/hotplug/pciehp_acpi.c @@ -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); |