diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 21:10:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 21:10:03 -0400 |
| commit | 5c4c1489b93c9dc51cc6e97fd73e325ce94983c0 (patch) | |
| tree | 16dc1628d614b882bb36fa57bdc88b1d30a83711 /drivers/mmc/host/sdhci.c | |
| parent | c2e68052429fdf87702fccd272951282bef1c60a (diff) | |
| parent | 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 (diff) | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 10d15c39d003..4a24db028d87 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) | |||
| 1024 | 1024 | ||
| 1025 | intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); | 1025 | intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); |
| 1026 | 1026 | ||
| 1027 | intmask &= ~SDHCI_INT_ERROR; | ||
| 1028 | |||
| 1027 | if (intmask & SDHCI_INT_BUS_POWER) { | 1029 | if (intmask & SDHCI_INT_BUS_POWER) { |
| 1028 | printk(KERN_ERR "%s: Card is consuming too much power!\n", | 1030 | printk(KERN_ERR "%s: Card is consuming too much power!\n", |
| 1029 | mmc_hostname(host->mmc)); | 1031 | mmc_hostname(host->mmc)); |