diff mbox series

[5.4,139/314] PCI: Fix pci_register_host_bridge() device_register() error handling

Message ID 20200623195345.491600428@linuxfoundation.org
State Superseded
Headers show
Series None | expand

Commit Message

Greg Kroah-Hartman June 23, 2020, 7:55 p.m. UTC 
From: Rob Herring <robh@kernel.org>


[ Upstream commit 1b54ae8327a4d630111c8d88ba7906483ec6010b ]

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

Fixes: 37d6a0a6f470 ("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>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---
 drivers/pci/probe.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.25.1
diff mbox series

Patch

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 83d909abc61d1..8fa13486f2f15 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -867,9 +867,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);