diff options
| author | Matthieu CASTET <matthieu.castet@parrot.com> | 2014-08-14 16:03:17 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-09-09 13:59:02 +0200 |
| commit | c5abd5e8998e20c2e82999670a03f26f1437d744 (patch) | |
| tree | 6db288f9ea42eb23996e791956088efaa723d55c /drivers/mmc/host | |
| parent | mmc: rtsx_usb_sdmmc: fix incorrect last byte in R2 response (diff) | |
| download | linux-c5abd5e8998e20c2e82999670a03f26f1437d744.tar.xz linux-c5abd5e8998e20c2e82999670a03f26f1437d744.zip | |
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 <matthieu.castet@parrot.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d25deff305a5..bcad1084cc74 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2304,6 +2304,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; |