summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-stm32-qspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-11-22 19:56:33 +0000
committerMark Brown <broonie@kernel.org>2019-11-22 19:56:33 +0000
commit8f3ed6d0b0db04db8297d951c26c809dd7b4778d (patch)
tree5813c89fa9245eb00e617b6dab89ddfe4a029184 /drivers/spi/spi-stm32-qspi.c
parentaf42d3466bdc8f39806b26f593604fdc54140bcb (diff)
parentc5923243eb3208ea63b5ed7905610039c4ca5201 (diff)
downloadtalos-op-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.tar.gz
talos-op-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.zip
Merge branch 'spi-5.4' into spi-linus
Diffstat (limited to 'drivers/spi/spi-stm32-qspi.c')
-rw-r--r--drivers/spi/spi-stm32-qspi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c
index 9ac6f9fe13cf..4e726929bb4f 100644
--- a/drivers/spi/spi-stm32-qspi.c
+++ b/drivers/spi/spi-stm32-qspi.c
@@ -528,7 +528,6 @@ static void stm32_qspi_release(struct stm32_qspi *qspi)
stm32_qspi_dma_free(qspi);
mutex_destroy(&qspi->lock);
clk_disable_unprepare(qspi->clk);
- spi_master_put(qspi->ctrl);
}
static int stm32_qspi_probe(struct platform_device *pdev)
@@ -626,6 +625,8 @@ static int stm32_qspi_probe(struct platform_device *pdev)
err:
stm32_qspi_release(qspi);
+ spi_master_put(qspi->ctrl);
+
return ret;
}
OpenPOWER on IntegriCloud