diff options
| author |   Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-12 14:36:53 +0200 |
|---|---|---|
| committer |   Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:25 -0400 |
| commit | 4a065193c46a16f1ddf20622c7011c8f327e0478 (patch) | |
| tree | 24636463147a37372ef5ebdc01aa7b32093b8c66 /drivers/mmc/core/sd.c | |
| parent | mmc: core: Do not poll for busy with status cmd for all switch cmds (diff) | |
| download | linux-dev-4a065193c46a16f1ddf20622c7011c8f327e0478.tar.xz linux-dev-4a065193c46a16f1ddf20622c7011c8f327e0478.zip | |
mmc: core: Let mmc_power_up|cycle take ocr as parameter
As a step to fixup the setup of the negotiated ocr mask, we need the
mmc_power_up|cycle functions to take the ocr as a parameter.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/sd.c')
| -rw-r--r-- | drivers/mmc/core/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 5e8823dc3ef6..af55e9e0819c 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1099,7 +1099,7 @@ static int mmc_sd_resume(struct mmc_host *host) BUG_ON(!host->card); mmc_claim_host(host); - mmc_power_up(host); + mmc_power_up(host, host->ocr); mmc_select_voltage(host, host->ocr); err = mmc_sd_init_card(host, host->ocr, host->card); mmc_release_host(host); @@ -1144,7 +1144,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) mmc_claim_host(host); - mmc_power_up(host); + mmc_power_up(host, host->ocr); err = mmc_sd_resume(host); if (err) pr_err("%s: error %d doing aggessive resume\n", |