From: Ulf Hansson Date: Thu, 31 May 2018 10:16:04 +0000 (+0200) Subject: mmc: mvsdio: Respect card busy time out from mmc core X-Git-Tag: v4.18-rc1~137^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0ef89ec24e7bfe17fb81ec222f3cd39bd5090efc;p=users%2Fwilly%2Flinux.git mmc: mvsdio: Respect card busy time out from mmc core Instead of using a hardcoded timeout of 5 * HZ jiffies, let's respect the command busy timeout provided by the mmc core. This make the used timeout more reliable. Cc: Damien Thebault Signed-off-by: Ulf Hansson Tested-by: Damien Thebault --- diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index 210247b3d11a..4c70829cffd7 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -143,6 +143,7 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq) struct mmc_command *cmd = mrq->cmd; u32 cmdreg = 0, xfer = 0, intr = 0; unsigned long flags; + unsigned int timeout; BUG_ON(host->mrq != NULL); host->mrq = mrq; @@ -234,7 +235,8 @@ static void mvsd_request(struct mmc_host *mmc, struct mmc_request *mrq) mvsd_write(MVSD_NOR_INTR_EN, host->intr_en); mvsd_write(MVSD_ERR_INTR_EN, 0xffff); - mod_timer(&host->timer, jiffies + 5 * HZ); + timeout = cmd->busy_timeout ? cmd->busy_timeout : 5000; + mod_timer(&host->timer, jiffies + msecs_to_jiffies(timeout)); spin_unlock_irqrestore(&host->lock, flags); }