diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2013-11-14 10:16:20 +0200 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-01-20 09:54:40 -0500 |
| commit | 3e1a6892481034193b2502725f787465ebf39818 (patch) | |
| tree | fd7969412565a38b9a74a32bac02ce4abff0003e /drivers/mmc | |
| parent | e5624054c1726a16c13a89c08b2792aba3df06eb (diff) | |
| download | op-kernel-dev-3e1a6892481034193b2502725f787465ebf39818.zip op-kernel-dev-3e1a6892481034193b2502725f787465ebf39818.tar.gz | |
mmc: sdhci: Allow for long command timeouts
The driver has a timer with a 10 second timeout to catch devices that stop
responding. However it is possible for commands to take even longer than
that. Change the timer timeout to reflect the command timeout.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 0a1893a..9ddef47 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1018,7 +1018,12 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) mdelay(1); } - mod_timer(&host->timer, jiffies + 10 * HZ); + timeout = jiffies; + if (!cmd->data && cmd->cmd_timeout_ms > 9000) + timeout += DIV_ROUND_UP(cmd->cmd_timeout_ms, 1000) * HZ + HZ; + else + timeout += 10 * HZ; + mod_timer(&host->timer, timeout); host->cmd = cmd; |
