lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'omap-clks3' into devel

Browse Source 
Conflicts:

	arch/arm/mach-omap2/clock.c
This commit is contained in:
Russell King
2009-03-19 12:39:58 +00:00
committed by Russell King
parent 05d9881bc4 4da3782151
commit 14b6848bc0
60 changed files with 3148 additions and 2603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/omap_hsmmc.c
View File

@@ -956,13 +956,13 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
sema_init(&host->sem, 1);
host->iclk = clk_get(&pdev->dev, "mmchs_ick");
host->iclk = clk_get(&pdev->dev, "ick");
if (IS_ERR(host->iclk)) {
ret = PTR_ERR(host->iclk);
host->iclk = NULL;
goto err1;
}
host->fclk = clk_get(&pdev->dev, "mmchs_fck");
host->fclk = clk_get(&pdev->dev, "fck");
if (IS_ERR(host->fclk)) {
ret = PTR_ERR(host->fclk);
host->fclk = NULL;