Unverified Commit dbb6b012 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: cavium-thunderx: fix controller deregistration 



Make sure to deregister the controller before disabling it to avoid
hanging or leaking resources associated with the queue when the queue
non-empty.

Fixes: 7347a6c7 ("spi: octeon: Add ThunderX driver")
Cc: stable@vger.kernel.org	# 4.9
Cc: Jan Glauber <jan.glauber@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-10-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3c49a4d8

drivers/spi/spi-cavium-thunderx.c

+7 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev, 


	pci_set_drvdata(pdev, host);



	ret = devm_spi_register_controller(dev, host);

	ret = spi_register_controller(host);

	if (ret)

		goto error;
@@ -90,8 +90,14 @@ static void thunderx_spi_remove(struct pci_dev *pdev) 
	if (!p)

		return;



	spi_controller_get(host);



	spi_unregister_controller(host);



	/* Put everything in a known state. */

	writeq(0, p->register_base + OCTEON_SPI_CFG(p));



	spi_controller_put(host);

}



static const struct pci_device_id thunderx_spi_pci_id_table[] = {