summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2013-01-07 10:58:35 +0100
committerFabio Baltieri <fabio.baltieri@linaro.org>2013-01-14 10:51:16 +0100
commitda2ac56a1bc9c6c56244aa9ca990d5c5c7574b5f (patch)
tree2fc8a260096f1dc7838ea28414fbd38c4a54d942 /drivers/dma
parent53d6d68f3c1792bce0144d8499435468e425a995 (diff)
downloadlinux-3.10-da2ac56a1bc9c6c56244aa9ca990d5c5c7574b5f.tar.gz
linux-3.10-da2ac56a1bc9c6c56244aa9ca990d5c5c7574b5f.tar.bz2
linux-3.10-da2ac56a1bc9c6c56244aa9ca990d5c5c7574b5f.zip
dmaengine: set_dma40: balance clock in probe fail code
Clock code was changed to use clk_prepare_enable in: b707c65 dma/ste_dma40: Fixup clock usage during probe but clk_disable on probe fail path was not updated. This patch fix this by using clk_disable_unprepare in place of clk_disable. Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
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 a97bbd3a4a4..d77d41d7c46 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -3634,7 +3634,7 @@ failure:
release_mem_region(base->phy_start,
base->phy_size);
if (base->clk) {
- clk_disable(base->clk);
+ clk_disable_unprepare(base->clk);
clk_put(base->clk);
}