Commit 612de4c1 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Chris Ball
Browse files

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: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent d8a4fb0e

drivers/mmc/host/dw_mmc.c

+8 −10
Original line number Diff line number Diff line
@@ -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 @@ int dw_mci_probe(struct dw_mci *host) 
err_dmaunmap:

	if (host->use_dma && host->dma_ops->exit)

		host->dma_ops->exit(host);



err_regulator:

	if (host->vmmc)

		regulator_disable(host->vmmc);