mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

dma/ste_dma40: Fixup clock usage during probe

Browse source 
Fixup some errorhandling for clocks during probe and make sure
to use clk_prepare as well as clk_enable.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
This commit is contained in:
Ulf Hansson 2012-08-23 13:41:58 +02:00 committed by Vinod Koul
parent 983d7beb7d
commit b707c65865
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/dma/ste_dma40.c
View file

@ -2920,19 +2920,23 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
struct d40_base *base = NULL; struct d40_base *base = NULL;
int num_log_chans = 0; int num_log_chans = 0;
int num_phy_chans; int num_phy_chans;
int clk_ret = -EINVAL;
int i; int i;
u32 pid; u32 pid;
u32 cid; u32 cid;
u8 rev; u8 rev;
clk = clk_get(&pdev->dev, NULL); clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
d40_err(&pdev->dev, "No matching clock found\n"); d40_err(&pdev->dev, "No matching clock found\n");
goto failure; goto failure;
} }
clk_enable(clk); clk_ret = clk_prepare_enable(clk);
if (clk_ret) {
d40_err(&pdev->dev, "Failed to prepare/enable clock\n");
goto failure;
}
/* Get IO for DMAC base address */ /* Get IO for DMAC base address */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "base"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "base");
@ -3062,10 +3066,10 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
return base; return base;
failure: failure:
if (!IS_ERR(clk)) { if (!clk_ret)
clk_disable(clk); clk_disable_unprepare(clk);
if (!IS_ERR(clk))
clk_put(clk); clk_put(clk);
}
if (virtbase) if (virtbase)
iounmap(virtbase); iounmap(virtbase);
if (res) if (res)