From e51dedbd2e371312951e910268ebfa1cf8d1e7e6 Mon Sep 17 00:00:00 2001 From: Manoj Vishwanathan Date: Wed, 5 Aug 2020 16:59:51 -0700 Subject: [PATCH] msm: pcie: Allow NULL as a valid return value for icc_get As the ICC_GET stub function returns NULL and it's valid, PCIe controller driver must continue without returning an error. This is the case when CONFIG_INTERCONNECT is not set. Change-Id: I0065caf71fd790feb0dbe6b459f203e58685be95 Signed-off-by: Manoj Vishwanathan --- drivers/pci/controller/pci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-msm.c b/drivers/pci/controller/pci-msm.c index c060eff2664e..8d881bd07833 100644 --- a/drivers/pci/controller/pci-msm.c +++ b/drivers/pci/controller/pci-msm.c @@ -3805,7 +3805,7 @@ static int msm_pcie_get_resources(struct msm_pcie_dev_t *dev, PCIE_DBG(dev, "PCIe: RC%d: entry\n", dev->rc_idx); dev->icc_path = of_icc_get(&pdev->dev, "icc_path"); - if (IS_ERR_OR_NULL(dev->icc_path)) { + if (IS_ERR(dev->icc_path)) { ret = dev->icc_path ? PTR_ERR(dev->icc_path) : -EINVAL; PCIE_ERR(dev, "PCIe: RC%d: failed to get ICC path: %d\n",