diff options
| author |   Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2021-01-25 02:28:26 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-22 10:40:30 +0200 |
| commit | c864ded837fcf0bd67a1d78a3ff3c879b1fc255c (patch) | |
| tree | c8222b1ed86365ccab87386c7409c0ac5e75cd29 | |
| parent | f2fs: fix a redundant call to f2fs_balance_fs if an error occurs (diff) | |
| download | linux-stable-c864ded837fcf0bd67a1d78a3ff3c879b1fc255c.tar.xz linux-stable-c864ded837fcf0bd67a1d78a3ff3c879b1fc255c.zip | |
PCI: Release OF node in pci_scan_device()'s error path
[ 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>
| -rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 19658873b4c1..ddf5ba63b195 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1694,6 +1694,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; |