4.9-stable review patch.  If anyone has any objections, please let me know.

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

From: Greg Kroah-Hartman <gre...@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 <fpar...@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.hutchi...@codethink.co.uk>
Cc: Kevin Hilman <khil...@baylibre.com>
Cc: Mark Brown <broo...@kernel.org>
Cc: Sasha Levin <alexander.le...@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gre...@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;
                }


Reply via email to