Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 622b5f35 authored by Christopher Freeman's avatar Christopher Freeman Committed by Ulf Hansson
Browse files

mmc: sdhci: Do not allow tuning procedure to be interrupted 



wait_event_interruptible_timeout() will return early if the blocked
process receives a signal, causing the driver to abort the tuning
procedure and possibly leaving the controller in a bad state.  Since the
tuning command is expected to complete quickly (<50ms) and we've set a
timeout, use wait_event_timeout() instead.

Signed-off-by: default avatarChristopher Freeman <cfreeman@nvidia.com>
Tested-by: default avatarRobert Foss <robert.foss@collabora.com>
Signed-off-by: default avatarRobert Foss <robert.foss@collabora.com>
Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2fb0b02b

drivers/mmc/host/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -2062,7 +2062,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 


		spin_unlock_irqrestore(&host->lock, flags);

		/* Wait for Buffer Read Ready interrupt */

		wait_event_interruptible_timeout(host->buf_ready_int,

		wait_event_timeout(host->buf_ready_int,

					(host->tuning_done == 1),

					msecs_to_jiffies(50));

		spin_lock_irqsave(&host->lock, flags);