tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'spi-fix-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
"A few small fixes for v6.9,

The core fix is for issues with reuse of a spi_message in the case
where we've got queued messages (a relatively rare occurrence with
modern code so it wasn't noticed in testing).

We also avoid an issue with the Kunpeng driver by simply removing the
debug interface that could trigger it, and address issues with
confusing and corrupted output when printing the IP version of the AXI
SPI engine"

* tag 'spi-fix-v6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: fix null pointer dereference within spi_sync
spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs
spi: axi-spi-engine: fix version format string

Linus Torvalds 9fbc8bdf f03359bc

+2 -3
+1 -1
drivers/spi/spi-axi-spi-engine.c
··· 623 623 624 624 version = readl(spi_engine->base + ADI_AXI_REG_VERSION); 625 625 if (ADI_AXI_PCORE_VER_MAJOR(version) != 1) { 626 - dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n", 626 + dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%u\n", 627 627 ADI_AXI_PCORE_VER_MAJOR(version), 628 628 ADI_AXI_PCORE_VER_MINOR(version), 629 629 ADI_AXI_PCORE_VER_PATCH(version));
-2
drivers/spi/spi-hisi-kunpeng.c
··· 151 151 HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR), 152 152 HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC), 153 153 HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR), 154 - HISI_SPI_DBGFS_REG("DIN", HISI_SPI_DIN), 155 - HISI_SPI_DBGFS_REG("DOUT", HISI_SPI_DOUT), 156 154 HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR), 157 155 HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR), 158 156 HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR),
+1
drivers/spi/spi.c
··· 4523 4523 wait_for_completion(&done); 4524 4524 status = message->status; 4525 4525 } 4526 + message->complete = NULL; 4526 4527 message->context = NULL; 4527 4528 4528 4529 return status;