]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
DMAENGINE: ste_dma40: fix clk_get failure path
authorRabin Vincent <rabin.vincent@stericsson.com>
Wed, 6 Oct 2010 08:20:36 +0000 (08:20 +0000)
committerDan Williams <dan.j.williams@intel.com>
Thu, 7 Oct 2010 21:54:55 +0000 (14:54 -0700)
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>
drivers/dma/ste_dma40.c

index 2f73e366111e08b55c65b338841c76f0255f172c..8596c318114b9c08f08a2199b3f543b1516db31a 100644 (file)
@@ -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);
        }