In of_iommu_xlate(), check if iommu device is enabled before traversing
the iommu_device_list through iommu_ops_from_fwnode(). It is of no use
in traversing the iommu_device_list only to return NO_IOMMU because of
iommu device node is disabled.

Signed-off-by: Charan Teja Reddy <chara...@codeaurora.org>
---
 drivers/iommu/of_iommu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index e505b91..225598c 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -94,9 +94,10 @@ static int of_iommu_xlate(struct device *dev,
        struct fwnode_handle *fwnode = &iommu_spec->np->fwnode;
        int ret;
 
+       if (!of_device_is_available(iommu_spec->np))
+               return NO_IOMMU;
        ops = iommu_ops_from_fwnode(fwnode);
-       if ((ops && !ops->of_xlate) ||
-           !of_device_is_available(iommu_spec->np))
+       if (ops && !ops->of_xlate)
                return NO_IOMMU;
 
        ret = iommu_fwspec_init(dev, &iommu_spec->np->fwnode, ops);
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member of the Code Aurora Forum, hosted by The Linux Foundation

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to