From 10cf4c97fd82ff9d79967f7626765a3ea995606b Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Mon, 14 Oct 2024 15:47:31 +0800 Subject: [PATCH] PCI: dw: rockchip: Fix rk_pcie_init_dma_trx If dma_object is not used, NULL pointer dereference was found. Fixes: 52729bfafff9 ("PCI: rockchip: dw: Move dma_obj initialization into rk_pcie_init_dma_trx()") Signed-off-by: Shawn Lin Change-Id: I5fe8ec539af1188b5da806026f164a493a577c46 --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c index 735357dbc3dc..5ac2e5bd0272 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -553,6 +553,8 @@ static int rk_pcie_init_dma_trx(struct rk_pcie *rk_pcie) if (IS_ERR(rk_pcie->dma_obj)) { dev_err(rk_pcie->pci->dev, "failed to prepare dmatest\n"); return -EINVAL; + } else if (!rk_pcie->dma_obj) { /* !CONFIG_ROCKCHIP_PCIE_DMA_OBJ */ + return 0; } /* Enable client write and read interrupt */