From: lintao Date: Mon, 10 Mar 2014 04:35:09 +0000 (+0800) Subject: mmc: sdio: fix sdio_reset_comm X-Git-Tag: firefly_0821_release~6165^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4700b767e80eb19d7e108427bc4c68f8c89ea7d9;p=firefly-linux-kernel-4.4.55.git mmc: sdio: fix sdio_reset_comm --- diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 413989e9d533..adfabcef3437 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -1275,7 +1275,7 @@ err: return err; } -/* + int sdio_reset_comm(struct mmc_card *card) { struct mmc_host *host = card->host; @@ -1293,13 +1293,13 @@ int sdio_reset_comm(struct mmc_card *card) if (err) goto err; - host->ocr = mmc_select_voltage(host, ocr); - if (!host->ocr) { + host->ocr_avail_sdio = mmc_select_voltage(host, ocr); + if (!host->ocr_avail_sdio) { err = -EINVAL; goto err; } - err = mmc_sdio_init_card(host, host->ocr, card, 0); + err = mmc_sdio_init_card(host, host->ocr_avail_sdio, card, 0); if (err) goto err; @@ -1312,4 +1312,4 @@ err: return err; } EXPORT_SYMBOL(sdio_reset_comm); -*/ +