dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

MMC: omap_hsmmc: enable interface clock before calling mmc_host_enable()

Browse source 
The code path entered via mmc_host_enable() can include register
accesses to the HSMMC IP block.  For this to work, both the device
interface clock and functional clock need to be enabled before
mmc_host_enable() is called.  However, omap_hsmmc_probe() calls
mmc_host_enable() before enabling the device interface clock.

Fix by calling mmc_host_enable() after the device interface clock is
enabled.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: Kishore Kadiyala <kishore.kadiyala@ti.com>
Cc: Tero Kristo <Tero.Kristo@nokia.com>
Acked-by: Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com>
This commit is contained in:
Paul Walmsley 2011-02-25 18:22:08 -07:00
parent dd9c1549ed
commit a05dcdb980
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mmc/host/omap_hsmmc.c
View file

@ -2101,14 +2101,14 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
/* we start off in DISABLED state */ /* we start off in DISABLED state */
host->dpm_state = DISABLED; host->dpm_state = DISABLED;
if (mmc_host_enable(host->mmc) != 0) { if (clk_enable(host->iclk) != 0) {
clk_put(host->iclk); clk_put(host->iclk);
clk_put(host->fclk); clk_put(host->fclk);
goto err1; goto err1;
} }
if (clk_enable(host->iclk) != 0) { if (mmc_host_enable(host->mmc) != 0) {
mmc_host_disable(host->mmc); clk_disable(host->iclk);
clk_put(host->iclk); clk_put(host->iclk);
clk_put(host->fclk); clk_put(host->fclk);
goto err1; goto err1;