aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2010-10-06 08:20:36 +0000
committerDan Williams <dan.j.williams@intel.com>2010-10-07 14:54:55 -0700
commitc6134c967c5b8b5986371de335fa4ec39de268bc (patch)
treed0ad380424a2fc37785a46118434b2b058cbda00 /drivers/dma
parentDMAENGINE: ste_dma40: fix disabled channels list (diff)
downloadlinux-dev-c6134c967c5b8b5986371de335fa4ec39de268bc.tar.xz
linux-dev-c6134c967c5b8b5986371de335fa4ec39de268bc.zip
DMAENGINE: ste_dma40: fix clk_get failure path
clk_get returns an ERR_PTR. Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ste_dma40.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 2f73e366111e..8596c318114b 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2636,7 +2636,7 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
return base;
failure:
- if (clk) {
+ if (!IS_ERR(clk)) {
clk_disable(clk);
clk_put(clk);
}