Skip to content

Commit d00d722

Browse files
jhovoldbroonie
authored andcommitted
spi: microchip-core-spi: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 059f545 ("spi: add support for microchip "soft" spi controller") Cc: stable@vger.kernel.org # 6.19 Cc: Prajna Rajendra Kumar <prajna.rajendrakumar@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-20-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e646414 commit d00d722

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/spi/spi-microchip-core-spi.c

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

385385
mchp_corespi_init(host, spi);
386386

387-
ret = devm_spi_register_controller(dev, host);
387+
ret = spi_register_controller(host);
388388
if (ret) {
389389
mchp_corespi_disable_ints(spi);
390390
mchp_corespi_disable(spi);
@@ -399,6 +399,8 @@ static void mchp_corespi_remove(struct platform_device *pdev)
399399
struct spi_controller *host = platform_get_drvdata(pdev);
400400
struct mchp_corespi *spi = spi_controller_get_devdata(host);
401401

402+
spi_unregister_controller(host);
403+
402404
mchp_corespi_disable_ints(spi);
403405
mchp_corespi_disable(spi);
404406
}

0 commit comments

Comments
 (0)