| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1352379984-18381-19-git-send-email-dragos.tatulea@intel.com> Date: Thu, 8 Nov 2012 15:06:16 +0200 From: dragos.tatulea@...el.com To: linux-kernel@...r.kernel.org, linux-mmc@...r.kernel.org, cjb@...top.org Cc: kirill.shutemov@...ux.intel.com, irina.tirdea@...el.com, octavian.purdila@...el.com, tony.luck@...el.com, keescook@...omium.org, dragos.tatulea@...il.com, Adrian Hunter <adrian.hunter@...el.com> Subject: [PATCH v2 18/26] mmc: sdhci: panic write: no timeout timer From: Adrian Hunter <adrian.hunter@...el.com> Signed-off-by: Adrian Hunter <adrian.hunter@...el.com> Signed-off-by: Irina Tirdea <irina.tirdea@...el.com> --- drivers/mmc/host/sdhci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists