aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 18:10:03 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 18:10:03 -0700
commit5c4c1489b93c9dc51cc6e97fd73e325ce94983c0 (patch)
tree16dc1628d614b882bb36fa57bdc88b1d30a83711 /drivers/mmc/host/sdhci.c
parentc2e68052429fdf87702fccd272951282bef1c60a (diff)
parent964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 (diff)
downloadmrst-s0i3-test-5c4c1489b93c9dc51cc6e97fd73e325ce94983c0.tar.gz
mrst-s0i3-test-5c4c1489b93c9dc51cc6e97fd73e325ce94983c0.tar.xz
mrst-s0i3-test-5c4c1489b93c9dc51cc6e97fd73e325ce94983c0.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: sdhci: make sure to clear the error interrupt mmc: at91_mci: wakeup on card insertion (or removal) mmc: add maintainer for at91
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 10d15c39d00..4a24db028d8 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1024,6 +1024,8 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK);
+ intmask &= ~SDHCI_INT_ERROR;
+
if (intmask & SDHCI_INT_BUS_POWER) {
printk(KERN_ERR "%s: Card is consuming too much power!\n",
mmc_hostname(host->mmc));