diff options
author | Tuomas Tynkkynen <ttynkkynen@nvidia.com> | 2013-06-11 06:11:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 19:46:06 -0400 |
commit | d777f98bfa44e5a2748603276e9e9fb6ab999079 (patch) | |
tree | 8119f2c7bedcde23d3d17d94db068a713ab20bdf /drivers/memory | |
parent | 2c9b48ac3cb2cd2c84c43f235c65b7fc238f6f1f (diff) |
memory: tegra20-mc: Fix hang in IRQ handler.
In Tegra20 any memory controller interrupt would cause an
infinite loop in the IRQ handler.
Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memory')
-rw-r--r-- | drivers/memory/tegra20-mc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/memory/tegra20-mc.c b/drivers/memory/tegra20-mc.c index 2ca5f2814f4a..0548eeacd573 100644 --- a/drivers/memory/tegra20-mc.c +++ b/drivers/memory/tegra20-mc.c | |||
@@ -193,8 +193,11 @@ static irqreturn_t tegra20_mc_isr(int irq, void *data) | |||
193 | mask &= stat; | 193 | mask &= stat; |
194 | if (!mask) | 194 | if (!mask) |
195 | return IRQ_NONE; | 195 | return IRQ_NONE; |
196 | while ((bit = ffs(mask)) != 0) | 196 | while ((bit = ffs(mask)) != 0) { |
197 | tegra20_mc_decode(mc, bit - 1); | 197 | tegra20_mc_decode(mc, bit - 1); |
198 | mask &= ~BIT(bit - 1); | ||
199 | } | ||
200 | |||
198 | mc_writel(mc, stat, MC_INTSTATUS); | 201 | mc_writel(mc, stat, MC_INTSTATUS); |
199 | return IRQ_HANDLED; | 202 | return IRQ_HANDLED; |
200 | } | 203 | } |