Skip to content

Commit 573c7db

Browse files
jhovoldbroonie
authored andcommitted
spi: mpfs: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 9ac8d17 ("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: Johan Hovold <johan@kernel.org> Acked-by: Conor Dooley <conor.dooley@microchip.com> Link: https://patch.msgid.link/20260409120419.388546-21-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent d00d722 commit 573c7db

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/spi/spi-mpfs.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ static int mpfs_spi_probe(struct platform_device *pdev)
574574

575575
mpfs_spi_init(host, spi);
576576

577-
ret = devm_spi_register_controller(&pdev->dev, host);
577+
ret = spi_register_controller(host);
578578
if (ret) {
579579
mpfs_spi_disable_ints(spi);
580580
mpfs_spi_disable(spi);
@@ -592,6 +592,8 @@ static void mpfs_spi_remove(struct platform_device *pdev)
592592
struct spi_controller *host = platform_get_drvdata(pdev);
593593
struct mpfs_spi *spi = spi_controller_get_devdata(host);
594594

595+
spi_unregister_controller(host);
596+
595597
mpfs_spi_disable_ints(spi);
596598
mpfs_spi_disable(spi);
597599
}

0 commit comments

Comments
 (0)