Commit d9bfbb95 authored Nov 26, 2015 by Adrian Hunter Committed by Ulf Hansson Dec 22, 2015

mmc: sdio: Fix invalid vdd in voltage switch power cycle



The 'ocr' parameter passed to mmc_set_signal_voltage()
defines the power-on voltage used when power cycling
after a failure to set the voltage.  However, in the
case of mmc_sdio_init_card(), the value passed has the
R4_18V_PRESENT flag set which is not valid for power-on
and results in an invalid vdd.  Fix by passing the card's
ocr value which does not have the flag.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v3.13+
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 9d5de93f

drivers/mmc/core/sdio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -630,7 +630,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
		*/
		if (!powered_resume && (rocr & ocr & R4_18V_PRESENT)) {
		err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
		ocr);
		ocr_card);
		if (err == -EAGAIN) {
		sdio_reset(host);
		mmc_go_idle(host);