Message ID | 1352379984-18381-19-git-send-email-dragos.tatulea@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index ff72e98..3653494 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1012,7 +1012,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) mdelay(1); } - mod_timer(&host->timer, jiffies + 10 * HZ); + if (!mmc_am_panic_task(host->mmc)) + mod_timer(&host->timer, jiffies + 10 * HZ); host->cmd = cmd; @@ -2117,7 +2118,8 @@ static void sdhci_tasklet_finish(unsigned long param) return; } - del_timer(&host->timer); + if (!mmc_am_panic_task(host->mmc)) + del_timer(&host->timer); mrq = host->mrq;