Most of the devices in OMAP family of SoCs are not using IOMMU. The
patch for converting the OMAP IOMMU to use generic IOMMU bus probe
functionality failed to add a check for this, so add it here.

Fixes: c822b37cac48 ("iommu/omap: Remove orphan_dev tracking")
Reported-by: Tomi Valkeinen <tomi.valkei...@ti.com>
Signed-off-by: Tero Kristo <t-kri...@ti.com>
---
Hi Joerg,

This patch applies on top of linux-next, fixing an issue present there
at the moment.

-Tero


 drivers/iommu/omap-iommu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 6480d5a62e33..c8282cc212cb 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1727,6 +1727,9 @@ static struct iommu_group *omap_iommu_device_group(struct 
device *dev)
        struct omap_iommu_arch_data *arch_data = dev->archdata.iommu;
        struct iommu_group *group = ERR_PTR(-EINVAL);
 
+       if (!arch_data)
+               return ERR_PTR(-ENODEV);
+
        if (arch_data->iommu_dev)
                group = iommu_group_ref_get(arch_data->iommu_dev->group);
 
-- 
2.17.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. 
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to