diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2015-11-26 14:00:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-03 15:06:51 -0800 |
| commit | 8dedf98a03b31c7087e22753024e282b47a8690f (patch) | |
| tree | a696c6bb7621eccf364bafe8a28254c94440b7fc | |
| parent | bd57fce6f51abecc06b025831a85c607af5b3f0d (diff) | |
| download | lwn-8dedf98a03b31c7087e22753024e282b47a8690f.tar.gz lwn-8dedf98a03b31c7087e22753024e282b47a8690f.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 4d721c6e2af0..ae360b3b4fda 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); |