diff options
| author | Radu Pirea <radu.pirea@microchip.com> | 2017-12-15 16:40:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-19 10:35:35 +0100 |
| commit | 66e900a3d225575c8b48b59ae1fe74bb6e5a65cc (patch) | |
| tree | b24e6cba0fb30059102ea9d7b79ec8af8bacd0c2 /drivers/spi | |
| parent | Linux 4.15-rc1 (diff) | |
| download | linux-66e900a3d225575c8b48b59ae1fe74bb6e5a65cc.tar.xz linux-66e900a3d225575c8b48b59ae1fe74bb6e5a65cc.zip | |
spi: atmel: fixed spin_lock usage inside atmel_spi_remove
The only part of atmel_spi_remove which needs to be atomic is hardware
reset.
atmel_spi_stop_dma calls dma_terminate_all and this needs interrupts
enabled.
atmel_spi_release_dma calls dma_release_channel and dma_release_channel
locks a mutex inside of spin_lock.
So the call of these functions can't be inside a spin_lock.
Reported-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Radu Pirea <radu.pirea@microchip.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index f95da364c283..669470971023 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1661,12 +1661,12 @@ static int atmel_spi_remove(struct platform_device *pdev) pm_runtime_get_sync(&pdev->dev); /* reset the hardware and block queue progress */ - spin_lock_irq(&as->lock); if (as->use_dma) { atmel_spi_stop_dma(master); atmel_spi_release_dma(master); } + spin_lock_irq(&as->lock); spi_writel(as, CR, SPI_BIT(SWRST)); spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */ spi_readl(as, SR); |