From 5af7b3e981b3211eb80652aa1bcc224a43582888 Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Fri, 7 Jun 2013 13:03:07 +0530 Subject: mmc: sdhci-msm: set the clock rate before enabling it The drivers must do clk_set_rate() before the first clk_prepare_enable() is invoked. Otherwise, the clock driver may give a warning for such clocks. CRs-fixed: 493685 Change-Id: I8342aa2f35d64a4dc7b8396bd9741c0aecaedc5c Signed-off-by: Sahitya Tummala --- drivers/mmc/host/sdhci-msm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index d36221fb30fa..b76bc6b617c8 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2151,16 +2151,16 @@ static int sdhci_msm_probe(struct platform_device *pdev) goto pclk_disable; } - ret = clk_prepare_enable(msm_host->clk); - if (ret) - goto pclk_disable; - /* Set to the minimum supported clock frequency */ ret = clk_set_rate(msm_host->clk, sdhci_msm_get_min_clock(host)); if (ret) { dev_err(&pdev->dev, "MClk rate set failed (%d)\n", ret); - goto clk_disable; + goto pclk_disable; } + ret = clk_prepare_enable(msm_host->clk); + if (ret) + goto pclk_disable; + msm_host->clk_rate = sdhci_msm_get_min_clock(host); atomic_set(&msm_host->clks_on, 1); -- cgit v1.2.3