diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-05-10 16:56:46 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-11 19:47:50 +0200 |
| commit | c56b2ddd5ff4352cdb0df07eefba8068d043382e (patch) | |
| tree | e6d7e438346d0a3fe2fb2182cf10e9f28fc630b1 /arch | |
| parent | Linux 2.6.39-rc7 (diff) | |
| download | linux-c56b2ddd5ff4352cdb0df07eefba8068d043382e.tar.xz linux-c56b2ddd5ff4352cdb0df07eefba8068d043382e.zip | |
omap: iommu: Return IRQ_HANDLED in fault handler when no fault occured
Commit d594f1f31afe13edd8c02f3854a65cc58cfb3b74 (omap: IOMMU: add
support to callback during fault handling) broke interrupt line sharing
between the OMAP3 ISP and its IOMMU. Because of this, every interrupt
generated by the OMAP3 ISP is handled by the IOMMU driver instead of
being passed to the OMAP3 ISP driver.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/iommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c index 8a51fd58f656..34fc31ee9081 100644 --- a/arch/arm/plat-omap/iommu.c +++ b/arch/arm/plat-omap/iommu.c @@ -793,6 +793,8 @@ static irqreturn_t iommu_fault_handler(int irq, void *data) clk_enable(obj->clk); errs = iommu_report_fault(obj, &da); clk_disable(obj->clk); + if (errs == 0) + return IRQ_HANDLED; /* Fault callback or TLB/PTE Dynamic loading */ if (obj->isr && !obj->isr(obj, da, errs, obj->isr_priv)) |