[PATCH] mmc: core: Fix bug on signal voltage switch failure

From: Naveen Kumar Parna
Date: Thu Mar 31 2016 - 10:17:34 EST


When switching SD and SDIO cards from 3.3V to 1.8V signal level fails, a bug in sdhci_set_power() will trigger.
To fix the kernel crash during recovery from signal voltage switch failure, OCR should be reset to avail voltage mask before power-cycle the card.

Signed-off-by: Naveen Kumar Parna <naveenkumar.parna@xxxxxxxxx>
---
drivers/mmc/core/core.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index f26a5f1..e7eb427 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1477,6 +1477,8 @@ power_cycle:
if (err) {
pr_debug("%s: Signal voltage switch failed, "
"power cycling card\n", mmc_hostname(host));
+ /* Reset OCR mask */
+ ocr = host->ocr_avail;
mmc_power_cycle(host, ocr);
}

--
1.9.1