From b1e9f3680319a6a9b0e82abc00c49f5908bb5d95 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 20 Jul 2007 18:20:36 +0200 Subject: [PATCH] --- yaml --- r: 62303 b: refs/heads/master c: 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 h: refs/heads/master i: 62301: 183849eb18baa65e73ed21526b8afdaeb9f3d75b 62299: 7807aa7a21cc49420d927103817749dc93e785cc 62295: 6d36d90d5a99384a9bb233ff20e0e7d9152acec8 62287: 29c92aa4bb037febdea138f2261e637ae2fc413f 62271: 71ea3c3095cc476376177c3dbfe7dacc84502863 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 2 ++ trunk/drivers/mmc/host/sdhci.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2cf313a246fe..bff024a276ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63b66438860f246f25f5563cde4978cf255cb810 +refs/heads/master: 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 10d15c39d003..4a24db028d87 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/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)); diff --git a/trunk/drivers/mmc/host/sdhci.h b/trunk/drivers/mmc/host/sdhci.h index 7400f4bc114f..a6c870480b8a 100644 --- a/trunk/drivers/mmc/host/sdhci.h +++ b/trunk/drivers/mmc/host/sdhci.h @@ -107,6 +107,7 @@ #define SDHCI_INT_CARD_INSERT 0x00000040 #define SDHCI_INT_CARD_REMOVE 0x00000080 #define SDHCI_INT_CARD_INT 0x00000100 +#define SDHCI_INT_ERROR 0x00008000 #define SDHCI_INT_TIMEOUT 0x00010000 #define SDHCI_INT_CRC 0x00020000 #define SDHCI_INT_END_BIT 0x00040000