Commit bf7eb32f authored Apr 06, 2018 by Greg Kroah-Hartman

spi: davinci: fix up dma_mapping_error() incorrect patch



commit aabb797b, 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>

parent 0151aaf5

drivers/spi/spi-davinci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -646,7 +646,7 @@ static int davinci_spi_bufs(struct spi_device spi, struct spi_transfer t)
		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;
		}