diff options
| author |   Adrian Hunter <adrian.hunter@intel.com> | 2015-11-26 14:00:47 +0200 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2015-12-22 11:32:15 +0100 |
| commit | d9bfbb95ed598a09cf336adb0f190ee0ff802f0d (patch) | |
| tree | bb533f31c77ddc0d6bccb3206d1f3804ef52105b /drivers/mmc/core/sdio.c | |
| parent | mmc: sdhci: Do not BUG on invalid vdd (diff) | |
| download | linux-dev-d9bfbb95ed598a09cf336adb0f190ee0ff802f0d.tar.xz linux-dev-d9bfbb95ed598a09cf336adb0f190ee0ff802f0d.zip | |
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>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
| -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 16d838e6d623..d61ba1a0495e 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -630,7 +630,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); |