From d028e66817bfd10d809a6d2b91ed3100d336992c Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Thu, 12 Jun 2025 09:41:46 +0800 Subject: [PATCH] PCI: rockchip: dw: Fix rk_pcie_remove() Fixes: fbdf4ef963fc ("PCI: rockchip: dw: Add remove() support") Signed-off-by: Shawn Lin Change-Id: I9f630c85a8022c02232f5898f35556f3eab20cf1 --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c index a08fab7c9790..f9c84def2614 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -1789,7 +1789,8 @@ static int rk_pcie_remove(struct platform_device *pdev) * Timeout should not happen as it's longer than regular probe actually. * But probe maybe fail, so need to double check bridge bus. */ - if (!rk_pcie || !rk_pcie->finish_probe || !rk_pcie->pci->pp.bridge->bus) { + if (!rk_pcie || !rk_pcie->pci || !rk_pcie->pci->pp.bridge || + !rk_pcie->pci->pp.bridge->bus) { dev_dbg(dev, "%s return early due to failure in threaded init\n", __func__); return 0; }