summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-02 14:25:01 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-02 14:25:00 -0800
commiteb0ef42d3a99005edee03056dc3f0c1153f0561e (patch)
treee4ee12780e0671b535eb6883926130be2f3d7793
parent4509e16fc9d03d4d5e3f38c547cef9b24e96a983 (diff)
parentfa5e1372df146a80aa006fceab43c011bdfd57d2 (diff)
Merge "mmc: sdhci: Ignore data end bit error interrupts."
-rw-r--r--drivers/mmc/host/sdhci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index d51195e8a352..08822464d82f 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2997,7 +2997,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
host->ops->adma_workaround(host, intmask);
}
if (host->data->error) {
- if (intmask & (SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_TIMEOUT)) {
+ if (intmask & (SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_TIMEOUT
+ | SDHCI_INT_DATA_END_BIT)) {
command = SDHCI_GET_CMD(sdhci_readw(host,
SDHCI_COMMAND));
if ((command != MMC_SEND_TUNING_BLOCK_HS200) &&