diff options
author | Mark Brown <broonie@kernel.org> | 2021-08-26 15:09:50 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-08-26 15:09:50 +0100 |
commit | d5f78f50fff3c69915bde28be901b8da56da7e06 (patch) | |
tree | 3d5faac00d27448d7d9cc496ab034f8bbcd31cdb /drivers/spi/spi-coldfire-qspi.c | |
parent | e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93 (diff) | |
parent | ea4ab99cb58cc9f8d64c0961ff9a059825f304cf (diff) |
Merge remote-tracking branch 'spi/for-5.14' into spi-linus
Diffstat (limited to 'drivers/spi/spi-coldfire-qspi.c')
-rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index 8996115ce736..263ce9047327 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c @@ -444,7 +444,7 @@ static int mcfqspi_remove(struct platform_device *pdev) mcfqspi_wr_qmr(mcfqspi, MCFQSPI_QMR_MSTR); mcfqspi_cs_teardown(mcfqspi); - clk_disable(mcfqspi->clk); + clk_disable_unprepare(mcfqspi->clk); return 0; } |