From: Adrian Hunter <adrian.hunter@intel.com>
Date: Wed, 29 Jun 2016 13:24:37 +0000 (+0300)
Subject: mmc: sdhci: Avoid STOP cmd triggering warning in sdhci_send_command()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8842fd17b655c19fa2f50cae5924b35769411da5;p=deliverable%2Flinux.git

mmc: sdhci: Avoid STOP cmd triggering warning in sdhci_send_command()

The STOP command is sent in error conditions, even when the command is
not finished. Avoid triggering the warning for that in sdhci_send_command()
by setting host->cmd to NULL first.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 614d77694f17..6c8cc1a1b858 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1027,6 +1027,8 @@ static void sdhci_finish_data(struct sdhci_host *host)
 			sdhci_do_reset(host, SDHCI_RESET_DATA);
 		}
 
+		/* Avoid triggering warning in sdhci_send_command() */
+		host->cmd = NULL;
 		sdhci_send_command(host, data->stop);
 	} else {
 		sdhci_finish_mrq(host, data->mrq);