From daacec69d8c61bfdcd1cca7e2e154eff89b271f0 Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Mon, 2 May 2011 18:07:01 +0530 Subject: [PATCH] --- yaml --- r: 270252 b: refs/heads/master c: 514d9eda92654430369060b91f7472bb198e7904 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/msm_sdcc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c2c8d639ae47..ce8acb0fb696 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dce7c756c84160424b3aea5ec36f221946bdc6f7 +refs/heads/master: 514d9eda92654430369060b91f7472bb198e7904 diff --git a/trunk/drivers/mmc/host/msm_sdcc.c b/trunk/drivers/mmc/host/msm_sdcc.c index 0f0b4fdb62ab..de00001a5349 100644 --- a/trunk/drivers/mmc/host/msm_sdcc.c +++ b/trunk/drivers/mmc/host/msm_sdcc.c @@ -1247,17 +1247,17 @@ msmsdcc_probe(struct platform_device *pdev) goto pclk_put; } - /* Enable clocks */ - ret = msmsdcc_enable_clocks(host); - if (ret) - goto clk_put; - ret = clk_set_rate(host->clk, msmsdcc_fmin); if (ret) { pr_err("%s: Clock rate set failed (%d)\n", __func__, ret); - goto clk_disable; + goto clk_put; } + /* Enable clocks */ + ret = msmsdcc_enable_clocks(host); + if (ret) + goto clk_put; + host->pclk_rate = clk_get_rate(host->pclk); host->clk_rate = clk_get_rate(host->clk);