diff mbox series

[4.4,154/190] PCI: Release OF node in pci_scan_device()s error path

Message ID 20210520092107.264256877@linuxfoundation.org
State New
Headers show
Series None | expand

Commit Message

Greg KH May 20, 2021, 9:23 a.m. UTC 
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>


[ Upstream commit c99e755a4a4c165cad6effb39faffd0f3377c02d ]

In pci_scan_device(), if pci_setup_device() fails for any reason, the code
will not release device's of_node by calling pci_release_of_node().  Fix
that by calling the release function.

Fixes: 98d9f30c820d ("pci/of: Match PCI devices to OF nodes dynamically")
Link: https://lore.kernel.org/r/20210124232826.1879-1-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Reviewed-by: Leon Romanovsky <leonro@nvidia.com>

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

---
 drivers/pci/probe.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.30.2
diff mbox series

Patch

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index becedabff141..63c62e2c8c0d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1668,6 +1668,7 @@  static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
 	pci_set_of_node(dev);
 
 	if (pci_setup_device(dev)) {
+		pci_release_of_node(dev);
 		pci_bus_put(dev->bus);
 		kfree(dev);
 		return NULL;