Signed-off-by: Tushar Behera <tushar.behera@xxxxxxxxxx> --- drivers/mmc/host/sdhci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c7851c0..2ff2b9e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -667,9 +667,9 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) return 0xE; /* timeout in us */ - if (!data) + if (!data) { target_timeout = cmd->cmd_timeout_ms * 1000; - else { + } else { target_timeout = data->timeout_ns / 1000; if (host->clock) target_timeout += data->timeout_clks / host->clock; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html