leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()

Browse Source 
The WARN_ON() in acpiphp_enumerate_slots() triggers unnecessarily for
devices whose bridges are going to be handled by native PCIe hotplug
(pciehp) and the simplest way to prevent that from happening is to
drop the WARN_ON().

References: https://bugzilla.kernel.org/show_bug.cgi?id=62831
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-10-12 01:49:48 +02:00
parent 5d4494573c
commit fd3cfebec3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,12 +994,13 @@ 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); pci_dev_put(bridge->pci_dev);