mmc: sdio: fix sdio_reset_comm() voltage selection

Change-Id: I2fa35ee9291c4c60e55fc11d923ae686a8f81920
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 915ff424669a2cc9071c9c3bd6d52a6900259931..231c97248add5dec6c9146dfe2ff1e94c17523d7 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -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;