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

spi: mpfs: fix controller deregistration 



Make sure to deregister the controller before disabling underlying
resources like interrupts during driver unbind.

Fixes: 9ac8d176 ("spi: add support for microchip fpga spi controllers")
Cc: stable@vger.kernel.org	# 6.0
Cc: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://patch.msgid.link/20260409120419.388546-21-johan@kernel.org


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

drivers/spi/spi-mpfs.c

+3 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static int mpfs_spi_probe(struct platform_device *pdev) 


	mpfs_spi_init(host, spi);



	ret = devm_spi_register_controller(&pdev->dev, host);

	ret = spi_register_controller(host);

	if (ret) {

		mpfs_spi_disable_ints(spi);

		mpfs_spi_disable(spi);
@@ -592,6 +592,8 @@ static void mpfs_spi_remove(struct platform_device *pdev) 
	struct spi_controller *host  = platform_get_drvdata(pdev);

	struct mpfs_spi *spi = spi_controller_get_devdata(host);



	spi_unregister_controller(host);



	mpfs_spi_disable_ints(spi);

	mpfs_spi_disable(spi);

}