mmc: sdio: fix sdio_reset_comm() voltage selection

Change-Id: I2fa35ee9291c4c60e55fc11d923ae686a8f81920
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Colin Cross
2014-03-19 12:46:49 -07:00
committed by John Stultz
parent 7923f784f3
commit c284cce930

View File

@@ -1222,6 +1222,7 @@ int sdio_reset_comm(struct mmc_card *card)
{
struct mmc_host *host = card->host;
u32 ocr;
u32 rocr;
int err;
printk("%s():\n", __func__);
@@ -1235,13 +1236,13 @@ int sdio_reset_comm(struct mmc_card *card)
if (err)
goto err;
host->ocr = mmc_select_voltage(host, ocr);
if (!host->ocr) {
rocr = mmc_select_voltage(host, ocr);
if (!rocr) {
err = -EINVAL;
goto err;
}
err = mmc_send_io_op_cond(host, host->ocr, &ocr);
err = mmc_sdio_init_card(host, rocr, card, 0);
if (err)
goto err;