Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92a3aebf authored by Balaji T K's avatar Balaji T K Committed by Chris Ball
Browse files

mmc: omap_hsmmc: context save after enabling runtime pm 



Call context save api after enabling runtime pm to make sure that
register access in context save api happens with clk enabled.

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarVenkatraman S <svenkatr@ti.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent d59d77ed

drivers/mmc/host/omap_hsmmc.c

+2 −2
Original line number Diff line number Diff line
@@ -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");

		/*