[PATCH] PCI: host-common: Fix driver remove NULL bridge->bus dereference

Rob Herring
2020-07-09T16:12:01Z

Commit 2d716c37b5ce ("PCI: host-common: Use struct
pci_host_bridge.windows list directly") moved platform_set_drvdata()
before pci_host_probe() which results in the bridge->bus pointer being
NULL. Let's change the drvdata to the bridge struct instead to fix this.

Fixes: 2d716c37b5ce ("PCI: host-common: Use struct pci_host_bridge.windows list directly")
Reported-by: Anders Roxell <anders.roxell@linaro.org>
Cc: Will Deacon <will@kernel.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/pci/controller/pci-host-common.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
index f8f71d99e427..b76e55f495e4 100644
--- a/drivers/pci/controller/pci-host-common.c
+++ b/drivers/pci/controller/pci-host-common.c
@@ -83,7 +83,7 @@ int pci_host_common_probe(struct platform_device *pdev)
bridge->map_irq = of_irq_parse_and_map_pci;
bridge->swizzle_irq = pci_common_swizzle;

- platform_set_drvdata(pdev, bridge->bus);
+ platform_set_drvdata(pdev, bridge);

return pci_host_probe(bridge);
}
@@ -91,11 +91,11 @@ EXPORT_SYMBOL_GPL(pci_host_common_probe);

int pci_host_common_remove(struct platform_device *pdev)
{
- struct pci_bus *bus = platform_get_drvdata(pdev);
+ struct pci_host_bridge *bridge = platform_get_drvdata(pdev);

pci_lock_rescan_remove();
- pci_stop_root_bus(bus);
- pci_remove_root_bus(bus);
+ pci_stop_root_bus(bridge->bus);
+ pci_remove_root_bus(bridge->bus);
pci_unlock_rescan_remove();

return 0;
--
2.25.1