diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2020-03-18 02:15:58 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-03-18 22:44:58 +0000 |
| commit | 3d6224e63be39ff26cf416492cb3923cd3d07dd0 (patch) | |
| tree | 9c8f60902b665a1def49b827ff59871c3910dd4d /drivers/spi | |
| parent | spi: spi-fsl-dspi: Replace interruptible wait queue with a simple completion (diff) | |
| download | wireguard-linux-3d6224e63be39ff26cf416492cb3923cd3d07dd0.tar.xz wireguard-linux-3d6224e63be39ff26cf416492cb3923cd3d07dd0.zip | |
spi: spi-fsl-dspi: Avoid NULL pointer in dspi_slave_abort for non-DMA mode
The driver does not create the dspi->dma structure unless operating in
DSPI_DMA_MODE, so it makes sense to check for that.
Fixes: f4b323905d8b ("spi: Introduce dspi_slave_abort() function for NXP's dspi SPI driver")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Tested-by: Michael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20200318001603.9650-8-olteanv@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index b65c21d048f9..81e22b6eadc7 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1192,8 +1192,10 @@ static int dspi_slave_abort(struct spi_master *master) * Terminate all pending DMA transactions for the SPI working * in SLAVE mode. */ - dmaengine_terminate_sync(dspi->dma->chan_rx); - dmaengine_terminate_sync(dspi->dma->chan_tx); + if (dspi->devtype_data->trans_mode == DSPI_DMA_MODE) { + dmaengine_terminate_sync(dspi->dma->chan_rx); + dmaengine_terminate_sync(dspi->dma->chan_tx); + } /* Clear the internal DSPI RX and TX FIFO buffers */ regmap_update_bits(dspi->regmap, SPI_MCR, |