diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-23 12:16:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-23 12:16:58 +0100 |
| commit | c4e85b7e6ff71a130710692fcb8daae5a638941f (patch) | |
| tree | 6188a8202ec834b947e81e3a6395e4d487b57e7a /drivers/spi | |
| parent | c8d6a77b5850dbf910e68ffe2054a6503ee2af47 (diff) | |
| parent | ba412e343d8bd628c1568a9b130210cc7d55e01c (diff) | |
| download | linux-c4e85b7e6ff71a130710692fcb8daae5a638941f.tar.gz linux-c4e85b7e6ff71a130710692fcb8daae5a638941f.tar.bz2 linux-c4e85b7e6ff71a130710692fcb8daae5a638941f.zip | |
Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-zynqmp-gqspi.c | 3 |
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) 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; } |