projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f55532a
)
spi: zynqmp: disable clocks in error paths
author
Shubhrajyoti Datta
<shubhrajyoti.datta@xilinx.com>
Wed, 4 May 2016 11:57:50 +0000
(17:27 +0530)
committer
Mark Brown
<broonie@kernel.org>
Wed, 4 May 2016 13:21:03 +0000
(14:21 +0100)
The if pclk enable fails the refclk is not disabled.
Fix the same.
Signed-off-by: Shubhrajyoti Datta <shubhraj@xilinx.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-zynqmp-gqspi.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-zynqmp-gqspi.c
b/drivers/spi/spi-zynqmp-gqspi.c
index
aab9b49
..
18aeace
100644
(file)
--- a/
drivers/spi/spi-zynqmp-gqspi.c
+++ b/
drivers/spi/spi-zynqmp-gqspi.c
@@
-360,7
+360,7
@@
static int zynqmp_prepare_transfer_hardware(struct spi_master *master)
ret = clk_enable(xqspi->refclk);
if (ret)
-
goto clk_err
;
+
return ret
;
ret = clk_enable(xqspi->pclk);
if (ret)
@@
-369,6
+369,7
@@
static int zynqmp_prepare_transfer_hardware(struct spi_master *master)
zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, GQSPI_EN_MASK);
return 0;
clk_err:
+ clk_disable(xqspi->refclk);
return ret;
}