Skip to content

Commit

Permalink
mmc: core: use card->ocr when negotiating voltage setting in mmc_sdio…
Browse files Browse the repository at this point in the history
…_power_restore

As we are restoring power to a known card, it makes sense to use
the 'ocr' value known for the card rather than the generic one
for the host interface.
This matches the use of card->ocr passed to mmc_power_up in
mmc_sdio_runtime_resume  (just before mmc_sdio_power_restore is
called), and the value passed to mmc_sdio_init_card() a little
later in mmc_sdio_power_restore().

Suggested-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
NeilBrown authored and Ulf Hansson committed Nov 26, 2014
1 parent a5eb8bb commit 59b6c9e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mmc/core/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ static int mmc_sdio_power_restore(struct mmc_host *host)

sdio_reset(host);
mmc_go_idle(host);
mmc_send_if_cond(host, host->ocr_avail);
mmc_send_if_cond(host, host->card->ocr);

ret = mmc_send_io_op_cond(host, 0, NULL);
if (ret)
Expand Down

0 comments on commit 59b6c9e

Please sign in to comment.