Commit 1b54ae83 authored May 13, 2020 by Rob Herring Committed by Bjorn Helgaas May 14, 2020

PCI: Fix pci_register_host_bridge() device_register() error handling

If device_register() has an error, we should bail out of
pci_register_host_bridge() rather than continuing on.

Fixes: 37d6a0a6 ("PCI: Add pci_register_host_bridge() interface")
Link: https://lore.kernel.org/r/20200513223859.11295-1-robh@kernel.org


Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>

parent 8f3d9f35

drivers/pci/probe.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -909,9 +909,10 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
		goto free;

		err = device_register(&bridge->dev);
		if (err)
		if (err) {
		put_device(&bridge->dev);

		goto free;
		}
		bus->bridge = get_device(&bridge->dev);
		device_enable_async_suspend(bus->bridge);
		pci_set_bus_of_node(bus);

Admin message