lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 102/102] spi: davinci: fix up dma_mapping_error() incorrect patch
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    commit aabb797b4c1204b2e8518538b2616e476f2bac92, which is commit
    c5a2a394835f473ae23931eda5066d3771d7b2f8 upstream had an error in it.

    Ben writes:
    The '!' needs to be deleted. This appears to have been fixed upstream
    by:

    commit 8aedbf580d21121d2a032e4c8ea12d8d2d85e275
    Author: Fabien Parent <fparent@baylibre.com>
    Date: Thu Feb 23 19:01:56 2017 +0100

    spi: davinci: Use SPI framework to handle DMA mapping

    which is not suitable for stable.

    So I'm just fixing this up directly.

    Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
    Cc: Kevin Hilman <khilman@baylibre.com>
    Cc: Mark Brown <broonie@kernel.org>
    Cc: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/spi/spi-davinci.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/spi/spi-davinci.c
    +++ b/drivers/spi/spi-davinci.c
    @@ -646,7 +646,7 @@ static int davinci_spi_bufs(struct spi_d
    buf = t->rx_buf;
    t->rx_dma = dma_map_single(&spi->dev, buf,
    t->len, DMA_FROM_DEVICE);
    - if (dma_mapping_error(&spi->dev, !t->rx_dma)) {
    + if (dma_mapping_error(&spi->dev, t->rx_dma)) {
    ret = -EFAULT;
    goto err_rx_map;
    }

    \
     
     \ /
      Last update: 2018-04-06 16:28    [W:10.133 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site