mmc: dw_mmc: replace the bus_hz checking point

It's right to check immediately whether host->bus_hz is assigned or not.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>

1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 8da598f8d96b..55c34cb702d4 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2427,12 +2427,19 @@ int dw_mci_probe(struct dw_mci *host)
                         ret = clk_set_rate(host->ciu_clk, host->pdata->bus_hz);
                         if (ret)
                                 dev_warn(host->dev,
-                                         "Unable to set bus rate to %ul\n",
+                                         "Unable to set bus rate to %uHz\n",
                                          host->pdata->bus_hz);
                 }
                 host->bus_hz = clk_get_rate(host->ciu_clk);
         }
 
+        if (!host->bus_hz) {
+                dev_err(host->dev,
+                        "Platform data must supply bus speed\n");
+                ret = -ENODEV;
+                goto err_clk_ciu;
+        }
+
         if (drv_data && drv_data->init) {
                 ret = drv_data->init(host);
                 if (ret) {
@@ -2469,13 +2476,6 @@ int dw_mci_probe(struct dw_mci *host)
                 }
         }
 
-        if (!host->bus_hz) {
-                dev_err(host->dev,
-                        "Platform data must supply bus speed\n");
-                ret = -ENODEV;
-                goto err_regulator;
-        }
-
         host->quirks = host->pdata->quirks;
 
         spin_lock_init(&host->lock);
@@ -2619,8 +2619,6 @@ err_workqueue:
 err_dmaunmap:
         if (host->use_dma && host->dma_ops->exit)
                 host->dma_ops->exit(host);
-
-err_regulator:
         if (host->vmmc)
                 regulator_disable(host->vmmc);