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>

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);