Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b7f909e authored by Colin Cross's avatar Colin Cross Committed by Dmitry Shmidt
Browse files

ANDROID: mmc: sdio: fix sdio_reset_comm() voltage selection 



Change-Id: I2fa35ee9291c4c60e55fc11d923ae686a8f81920
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
parent 137aeca2

drivers/mmc/core/sdio.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1220,6 +1220,7 @@ int sdio_reset_comm(struct mmc_card *card) 
{

{

	struct mmc_host *host = card->host;

	struct mmc_host *host = card->host;

	u32 ocr;

	u32 ocr;

	u32 rocr;

	int err;

	int err;





	printk("%s():\n", __func__);

	printk("%s():\n", __func__);
@@ -1233,13 +1234,13 @@ int sdio_reset_comm(struct mmc_card *card) 
	if (err)

	if (err)

		goto err;

		goto err;





	host->ocr = mmc_select_voltage(host, ocr);

	rocr = mmc_select_voltage(host, ocr);

	if (!host->ocr) {

	if (!rocr) {

		err = -EINVAL;

		err = -EINVAL;

		goto err;

		goto err;

	}

	}





	err = mmc_send_io_op_cond(host, host->ocr, &ocr);

	err = mmc_sdio_init_card(host, rocr, card, 0);

	if (err)

	if (err)

		goto err;

		goto err;