aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>2016-05-04 07:57:50 -0400
committerMark Brown <broonie@kernel.org>2016-05-04 09:21:03 -0400
commitba412e343d8bd628c1568a9b130210cc7d55e01c (patch)
tree3a1984507ca6f5e9863bda3a9620b3bca13f9b75
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
spi: zynqmp: disable clocks in error paths
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>
-rw-r--r--drivers/spi/spi-zynqmp-gqspi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
index aab9b492c627..18aeaceee286 100644
--- 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)
360 360
361 ret = clk_enable(xqspi->refclk); 361 ret = clk_enable(xqspi->refclk);
362 if (ret) 362 if (ret)
363 goto clk_err; 363 return ret;
364 364
365 ret = clk_enable(xqspi->pclk); 365 ret = clk_enable(xqspi->pclk);
366 if (ret) 366 if (ret)
@@ -369,6 +369,7 @@ static int zynqmp_prepare_transfer_hardware(struct spi_master *master)
369 zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, GQSPI_EN_MASK); 369 zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, GQSPI_EN_MASK);
370 return 0; 370 return 0;
371clk_err: 371clk_err:
372 clk_disable(xqspi->refclk);
372 return ret; 373 return ret;
373} 374}
374 375