Commit ef4815ab authored Feb 24, 2011 by Martin Hostettler Committed by Tony Lindgren Feb 24, 2011

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>

parent 7cab8713

arch/arm/plat-omap/iommu.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,9 @@ static int iommu_enable(struct iommu *obj)
	if (!obj)		if (!obj)
	return -EINVAL;		return -EINVAL;

			if (!arch_iommu)
			return -ENODEV;

	clk_enable(obj->clk);		clk_enable(obj->clk);

	err = arch_iommu->enable(obj);		err = arch_iommu->enable(obj);