Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e51dedbd authored by Manoj Vishwanathan's avatar Manoj Vishwanathan Committed by Gerrit - the friendly Code Review server
Browse files

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: default avatarManoj Vishwanathan <mvishwan@codeaurora.org>
parent 5f5ad727

drivers/pci/controller/pci-msm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

	PCIE_DBG(dev, "PCIe: RC%d: entry\n", dev->rc_idx);





	dev->icc_path = of_icc_get(&pdev->dev, "icc_path");

	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;

		ret = dev->icc_path ? PTR_ERR(dev->icc_path) : -EINVAL;





		PCIE_ERR(dev, "PCIe: RC%d: failed to get ICC path: %d\n",

		PCIE_ERR(dev, "PCIe: RC%d: failed to get ICC path: %d\n",