From: Martin Hostettler <martin@neutronstar.dyndns.org>
Date: Thu, 24 Feb 2011 20:51:31 +0000 (-0800)
Subject: omap: iommu: Gracefully fail iommu_enable if no arch_iommu is registered
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ef4815ab1ff10d642c21ef92faa6544934bc78d1;p=deliverable%2Flinux.git

omap: iommu: Gracefully fail iommu_enable if no arch_iommu is registered

In a modular build of the iommu code it's possible that the arch iommu code
isn't loaded when trying to enable the iommu. Instead of blindly following a
null pointer return -NODEV in that case.

Signed-off-by: Martin Hostettler <martin@neutronstar.dyndns.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index b1107c08da56..3d8f55ea8666 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -104,6 +104,9 @@ static int iommu_enable(struct iommu *obj)
 	if (!obj)
 		return -EINVAL;
 
+	if (!arch_iommu)
+		return -ENODEV;
+
 	clk_enable(obj->clk);
 
 	err = arch_iommu->enable(obj);