Commit 65169048 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fix from Mark Brown:
 "One device specific fix here, it was possible we might end up trying
  to dereference an invalid pointer while reporting a transfer timeout
  on DesignWare controllers"

* tag 'spi-fix-v7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spi-dw-dma: fix print error log when wait finish transaction
parents 5abeba61 3b46d618

drivers/spi/spi-dw-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int dw_spi_dma_wait(struct dw_spi *dws, unsigned int len, u32 speed) 
					 msecs_to_jiffies(ms));



	if (ms == 0) {

		dev_err(&dws->ctlr->cur_msg->spi->dev,

		dev_err(&dws->ctlr->dev,

			"DMA transaction timed out\n");

		return -ETIMEDOUT;

	}