]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 1 Feb 2016 17:39:30 +0000 (12:39 -0500)
commite6cbcb008a279d7794fba01799ecfb6be391484f
tree59d641bd52110dcf1b8f178513e3d340cd5c5aa6
parent86062e985300bc13fc5d29c862e34047bcb65c7e
mmc: sdio: Fix invalid vdd in voltage switch power cycle

[ Upstream commit d9bfbb95ed598a09cf336adb0f190ee0ff802f0d ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/mmc/core/sdio.c