diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2015-11-26 14:00:47 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-02 17:38:44 +0000 |
| commit | 926c0116ab3c099306567fd321d78252e1395512 (patch) | |
| tree | 87ba3e041fc4b153542d2dae84f1efab11349cf4 /drivers/mmc | |
| parent | 896713b0ff8524d427ac2659411f685007f83c8b (diff) | |
| download | linux-stable-926c0116ab3c099306567fd321d78252e1395512.tar.gz linux-stable-926c0116ab3c099306567fd321d78252e1395512.tar.bz2 linux-stable-926c0116ab3c099306567fd321d78252e1395512.zip | |
mmc: sdio: Fix invalid vdd in voltage switch power cycle
commit d9bfbb95ed598a09cf336adb0f190ee0ff802f0d upstream.
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>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 3fc40a7140a8..817d4bf30ce4 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -670,7 +670,7 @@ try_again: */ 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); |