diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-09-12 15:36:34 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-10-30 20:26:26 -0400 |
| commit | 0f791fdad82a02af013e4fc8c385dc690080c366 (patch) | |
| tree | 265a07101e0165b05fae01cb9236f142578d47b1 /drivers/mmc/core/core.c | |
| parent | 4a065193c46a16f1ddf20622c7011c8f327e0478 (diff) | |
mmc: core: Let mmc_set_signal_voltage take ocr as parameter
This is yet another step of restructure code to be able to fixup the
setup of the negotiated ocr mask.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/core.c')
| -rw-r--r-- | drivers/mmc/core/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index b66e7ab2ad43..5909ba46b8f2 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1397,7 +1397,7 @@ int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) } -int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) +int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr) { struct mmc_command cmd = {0}; int err = 0; @@ -1479,7 +1479,7 @@ power_cycle: if (err) { pr_debug("%s: Signal voltage switch failed, " "power cycling card\n", mmc_hostname(host)); - mmc_power_cycle(host, host->ocr); + mmc_power_cycle(host, ocr); } mmc_host_clk_release(host); |