lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'acpi-pci-hotplug'

Browse Source 
* acpi-pci-hotplug:
  ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()
  ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()
This commit is contained in:
Rafael J. Wysocki
2013-10-12 15:19:52 +02:00
parent aaf3d29fe8 fd3cfebec3
commit 2c5bfce855
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/hotplug/acpiphp_glue.c
View File

@@ -994,14 +994,16 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
/* /*
* This bridge should have been registered as a hotplug function * This bridge should have been registered as a hotplug function
* under its parent, so the context has to be there. If not, we * under its parent, so the context should be there, unless the
* are in deep goo. * parent is going to be handled by pciehp, in which case this
* bridge is not interesting to us either.
*/ */
mutex_lock(&acpiphp_context_lock); mutex_lock(&acpiphp_context_lock);
context = acpiphp_get_context(handle); context = acpiphp_get_context(handle);
if (WARN_ON(!context)) { if (!context) {
mutex_unlock(&acpiphp_context_lock); mutex_unlock(&acpiphp_context_lock);
put_device(&bus->dev); put_device(&bus->dev);
pci_dev_put(bridge->pci_dev);
kfree(bridge); kfree(bridge);
return; return;
} }