Commit 9fbc8bdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f03359bc 4756fa52

drivers/spi/spi-axi-spi-engine.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int spi_engine_probe(struct platform_device *pdev) 


	version = readl(spi_engine->base + ADI_AXI_REG_VERSION);

	if (ADI_AXI_PCORE_VER_MAJOR(version) != 1) {

		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",

		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%u\n",

			ADI_AXI_PCORE_VER_MAJOR(version),

			ADI_AXI_PCORE_VER_MINOR(version),

			ADI_AXI_PCORE_VER_PATCH(version));

drivers/spi/spi-hisi-kunpeng.c

+0 −2
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ static const struct debugfs_reg32 hisi_spi_regs[] = { 
	HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR),

	HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC),

	HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR),

	HISI_SPI_DBGFS_REG("DIN", HISI_SPI_DIN),

	HISI_SPI_DBGFS_REG("DOUT", HISI_SPI_DOUT),

	HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR),

	HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR),

	HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR),

drivers/spi/spi.c

+1 −0
Original line number Diff line number Diff line
@@ -4523,6 +4523,7 @@ static int __spi_sync(struct spi_device *spi, struct spi_message *message) 
		wait_for_completion(&done);

		status = message->status;

	}

	message->complete = NULL;

	message->context = NULL;



	return status;