From d55a23a1cfcc65522122fc42e18af1c51289de10 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Wed, 25 Aug 2010 14:17:05 +0530 Subject: [PATCH 15/36] DMAENGINE: ste_dma40: fix clk_get failure path clk_get returns an ERR_PTR. Acked-by: Jonas Aaberg Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 2f73e36..8596c31 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); } -- 1.6.3.3