From: Bridge Wu <mingqiao.wu@gmail.com>
Date: Tue, 25 Sep 2007 16:59:07 +0000 (+0200)
Subject: mmc: pxamci: better pending IRQ determination
X-Git-Tag: v2.6.24-rc1~1464^2~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81ab570f65395f09962f4bca0d89403f8911c071;p=linux-2.6

mmc: pxamci: better pending IRQ determination

Pending interrupts should be determined from both I_REG and I_MASK
registers.

Signed-off-by: Bridge Wu <mingqiao.wu@gmail.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index b89e32d1e9..03d1628811 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -298,7 +298,7 @@ static irqreturn_t pxamci_irq(int irq, void *devid)
 	unsigned int ireg;
 	int handled = 0;
 
-	ireg = readl(host->base + MMC_I_REG);
+	ireg = readl(host->base + MMC_I_REG) & ~readl(host->base + MMC_I_MASK);
 
 	if (ireg) {
 		unsigned stat = readl(host->base + MMC_STAT);