| commit | 6d70e4fb60f24d2f6ed2a3ddd88d28430ccf21c9 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Oct 15 18:34:31 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Oct 15 18:34:29 2012 -0700 |
| tree | 2792af72c6ff864cfc058e127190d3f7cd68e2bc | |
| parent | afba8304f351673622e28b1ff59845444eeb6ce6 [diff] | |
| parent | 52f50c4f42dda6235f7d72fc47ae7412bec65f53 [diff] |
Merge "iommu: Make termination of stalled transaction optional"
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index df66a3a..63a027b 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c
@@ -1122,7 +1122,12 @@ } SET_FSR(base, num, fsr); - SET_RESUME(base, num, 1); + /* + * Only resume fetches if the registered fault handler + * allows it + */ + if (ret != -EBUSY) + SET_RESUME(base, num, 1); ret = IRQ_HANDLED; } else