From 5a4b726bf24238cb6936c73cb015dd2a981c0e70 Mon Sep 17 00:00:00 2001 From: Christopher Freeman Date: Tue, 16 Aug 2016 10:37:12 +0800 Subject: [PATCH] FROMLIST: 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. Change-Id: Ibd1c5e8076c5fde4b4e9c4ebb0a2733c8d2d4eda Signed-off-by: Christopher Freeman Tested-by: Robert Foss Signed-off-by: Robert Foss Reviewed-by: Benson Leung Signed-off-by: Shawn Lin --- drivers/mmc/host/sdhci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6ffff1651438..8de66ef25988 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2023,9 +2023,9 @@ 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, - (host->tuning_done == 1), - msecs_to_jiffies(50)); + wait_event_timeout(host->buf_ready_int, + (host->tuning_done == 1), + msecs_to_jiffies(50)); spin_lock_irqsave(&host->lock, flags); if (!host->tuning_done) { -- 2.34.1