lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 031/254] spi: spi-fsl-dspi: Avoid NULL pointer in dspi_slave_abort for non-DMA mode
    Date
    From: Vladimir Oltean <vladimir.oltean@nxp.com>

    [ Upstream commit 3d6224e63be39ff26cf416492cb3923cd3d07dd0 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-fsl-dspi.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
    index 6ec2dcb8c57a6..2ce65edf16b66 100644
    --- a/drivers/spi/spi-fsl-dspi.c
    +++ b/drivers/spi/spi-fsl-dspi.c
    @@ -1021,8 +1021,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,
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-04-16 17:05    [W:5.234 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site