Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fd3cfebec3199bb89acead236b1ab12c349ed4e0

Authored by Rafael J. Wysocki
1 parent 5d4494573c
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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

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>

Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff

drivers/pci/hotplug/acpiphp_glue.c
Diff comments   View file @ fd3cfeb
... ... @@ -994,12 +994,13 @@
994 994  
995 995 /*
996 996 * This bridge should have been registered as a hotplug function
997   - * under its parent, so the context has to be there. If not, we
998   - * are in deep goo.
  997 + * under its parent, so the context should be there, unless the
  998 + * parent is going to be handled by pciehp, in which case this
  999 + * bridge is not interesting to us either.
999 1000 */
1000 1001 mutex_lock(&acpiphp_context_lock);
1001 1002 context = acpiphp_get_context(handle);
1002   - if (WARN_ON(!context)) {
  1003 + if (!context) {
1003 1004 mutex_unlock(&acpiphp_context_lock);
1004 1005 put_device(&bus->dev);
1005 1006 pci_dev_put(bridge->pci_dev);