[<prev] [next>] [day] [month] [year] [list]
Message-ID: <CAPgLHd_MgPJvMmijLXk2YERqy1BkG8jr6PZtiVjuSXcPmebuMQ@mail.gmail.com>
Date: Fri, 15 Nov 2013 17:57:09 +0800
From: Wei Yongjun <weiyj.lk@...il.com>
To: vinod.koul@...el.com, dan.j.williams@...el.com,
grant.likely@...aro.org, rob.herring@...xeda.com
Cc: yongjun_wei@...ndmicro.com.cn, linux-kernel@...r.kernel.org
Subject: [PATCH] dma: k3dma: add missing clk_disable_unprepare() on error in k3_dma_probe()
From: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
Add the missing clk_disable_unprepare() before return
from k3_dma_probe() in the error handling case.
Signed-off-by: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
---
drivers/dma/k3dma.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index a2c330f..892704f 100644
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -750,7 +750,7 @@ static int k3_dma_probe(struct platform_device *op)
ret = dma_async_device_register(&d->slave);
if (ret)
- return ret;
+ goto dma_async_register_fail;
ret = of_dma_controller_register((&op->dev)->of_node,
k3_of_dma_simple_xlate, d);
@@ -767,6 +767,8 @@ static int k3_dma_probe(struct platform_device *op)
of_dma_register_fail:
dma_async_device_unregister(&d->slave);
+dma_async_register_fail:
+ clk_disable_unprepare(d->clk);
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists