Merge "msm: pcie: Allow NULL as a valid return value for icc_get"
This commit is contained in:
commit
614beb4231
@ -4431,7 +4431,7 @@ static int msm_pcie_get_resources(struct msm_pcie_dev_t *dev,
|
||||
return ret;
|
||||
|
||||
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",
|
||||
|
Loading…
Reference in New Issue
Block a user