mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next
This commit is contained in:
commit
c4e85b7e6f
1 changed files with 2 additions and 1 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue