Skip to content

Commit 6516904

Browse files
committed
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
2 parents 5abeba6 + 3b46d61 commit 6516904

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/spi/spi-dw-dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static int dw_spi_dma_wait(struct dw_spi *dws, unsigned int len, u32 speed)
271271
msecs_to_jiffies(ms));
272272

273273
if (ms == 0) {
274-
dev_err(&dws->ctlr->cur_msg->spi->dev,
274+
dev_err(&dws->ctlr->dev,
275275
"DMA transaction timed out\n");
276276
return -ETIMEDOUT;
277277
}

0 commit comments

Comments
 (0)