From f60fa7252ef587c68e8652cb6de98f7705c8089e Mon Sep 17 00:00:00 2001 From: Balaji T K Date: Fri, 24 Feb 2012 21:14:34 +0530 Subject: [PATCH] --- yaml --- r: 298807 b: refs/heads/master c: 92a3aebf06bdef849cc53aba99f963a9ae397e9d h: refs/heads/master i: 298805: 990af6e5d7cd3066f5bbd1c5ffd94841e435e923 298803: 39682906bb42a3a5bb4d0a81a857778f86d1f9ec 298799: 914f224257b440dd676c9d9823b79e31767060e7 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4b9f18db7918..3fc26e87bc58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d59d77ed1e0cdd254f99260013b27d64dc1dffac +refs/heads/master: 92a3aebf06bdef849cc53aba99f963a9ae397e9d diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index f15b04b9da27..4ee1570d18d6 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -1875,8 +1875,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) goto err1; } - omap_hsmmc_context_save(host); - if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) { dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n"); mmc->caps2 |= MMC_CAP2_NO_MULTI_READ; @@ -1887,6 +1885,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) pm_runtime_set_autosuspend_delay(host->dev, MMC_AUTOSUSPEND_DELAY); pm_runtime_use_autosuspend(host->dev); + omap_hsmmc_context_save(host); + if (cpu_is_omap2430()) { host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck"); /*