From: Rob Herring <robh@kernel.org>
Date: Wed, 13 May 2020 22:38:58 +0000 (-0500)
Subject: PCI: Fix pci_register_host_bridge() device_register() error handling
X-Git-Tag: v5.7.6~276
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd2036f8053d1b8294d8bf5d9a91b2130cb7120e;p=thirdparty%2Fkernel%2Fstable.git

PCI: Fix pci_register_host_bridge() device_register() error handling

[ 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>
---

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c7e3a8267521b..b59a4b0f5f162 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -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);