commit 33ef82c64cfdfc610aeabcea905161c399319b83
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 19 11:43:35 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 19 11:43:35 2017 -0700
tree 68ed24650bf3dd93650ee3f4e1111ca50ee94608
parent 2c52a616bcef2115c783c10889550e8f389cb05c
parent ac6de6d6b362486b6571bcbb31a4d4a6054705f1

Merge "mmc: sdhci: remove incorrect spinlock release" into msm-4.9

drivers/mmc/host/sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 47096fd..744e520 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1523,7 +1523,7 @@
 	sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);
 
 	/* Wait max 20 ms */
-	timeout = 20000;
+	timeout = 20;
 	while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
 		& SDHCI_CLOCK_INT_STABLE)) {
 		if (timeout == 0) {
@@ -1533,9 +1533,7 @@
 			return;
 		}
 		timeout--;
-		spin_unlock_irq(&host->lock);
 		usleep_range(900, 1100);
-		spin_lock_irq(&host->lock);
 	}
 
 	clk |= SDHCI_CLOCK_CARD_EN;