mmc: sdio: Fix invalid vdd in voltage switch power cycle
authorAdrian Hunter <adrian.hunter@intel.com>
Thu, 26 Nov 2015 12:00:47 +0000 (14:00 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 22 Dec 2015 10:32:15 +0000 (11:32 +0100)
commitd9bfbb95ed598a09cf336adb0f190ee0ff802f0d
treebb533f31c77ddc0d6bccb3206d1f3804ef52105b
parent9d5de93f6d543b356e39e225988ef443a7bce34c
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>
drivers/mmc/core/sdio.c