From 784248a0e50058f380e87bacedf38c8eb48b5af2 Mon Sep 17 00:00:00 2001 From: Matthieu CASTET Date: Thu, 14 Aug 2014 16:03:17 +0200 Subject: sdhci : handle busy timeout irq When we wait for busy after sending a command, if there is a timeout, we got SDHCI_INT_DATA_TIMEOUT flags. Before this commit we got the message : "Got data interrupt 0x00100000 even though no data operation was in progress." and we need to wait 10s that sdhci_timeout_timer expires. Signed-off-by: Matthieu CASTET Signed-off-by: Ulf Hansson (cherry picked from commit c5abd5e8998e20c2e82999670a03f26f1437d744) --- drivers/mmc/host/sdhci.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers') diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 836b0451c9e4..59d6b719b0aa 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2211,6 +2211,11 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) * above in sdhci_cmd_irq(). */ if (host->cmd && (host->cmd->flags & MMC_RSP_BUSY)) { + if (intmask & SDHCI_INT_DATA_TIMEOUT) { + host->cmd->error = -ETIMEDOUT; + tasklet_schedule(&host->finish_tasklet); + return; + } if (intmask & SDHCI_INT_DATA_END) { sdhci_finish_command(host); return; -- cgit v1.2.3