Commit 81e41be9 authored by Tobias Schramm's avatar Tobias Schramm Committed by Ulf Hansson
Browse files

mmc: mmc_spi: fix timeout calculation 



Previously the cycle timeout was converted to a microsecond value but
then incorrectly treated as a nanosecond timeout. This patch changes
the code to convert both the nanosecond timeout and the cycle timeout
to a microsecond value and use that directly.

Signed-off-by: default avatarTobias Schramm <t.schramm@manjaro.org>
Link: https://lore.kernel.org/r/20200814185011.3252020-1-t.schramm@manjaro.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b698f6ab

drivers/mmc/host/mmc_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -882,9 +882,9 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, 
	else

		clock_rate = spi->max_speed_hz;



	timeout = data->timeout_ns +

	timeout = data->timeout_ns / 1000 +

		  data->timeout_clks * 1000000 / clock_rate;

	timeout = usecs_to_jiffies((unsigned int)(timeout / 1000)) + 1;

	timeout = usecs_to_jiffies((unsigned int)timeout) + 1;



	/* Handle scatterlist segments one at a time, with synch for

	 * each 512-byte block