]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: pic32-sqi: fix controller deregistration
authorJohan Hovold <johan@kernel.org>
Fri, 10 Apr 2026 08:17:37 +0000 (10:17 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 10 Apr 2026 12:22:29 +0000 (13:22 +0100)
Make sure to deregister the controller before releasing underlying
resources like DMA during driver unbind.

Fixes: 3270ac230f66 ("spi: pic32-sqi: add SPI driver for PIC32 SQI controller.")
Cc: stable@vger.kernel.org # 4.7
Cc: Purna Chandra Mandal <purna.mandal@microchip.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-8-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-pic32-sqi.c

index 0515900388952ea92473dd72d1602554cc7ab228..41662992dbe50c8ccf566c60f0ec41c672e4f478 100644 (file)
@@ -642,7 +642,7 @@ static int pic32_sqi_probe(struct platform_device *pdev)
        host->prepare_transfer_hardware = pic32_sqi_prepare_hardware;
        host->unprepare_transfer_hardware       = pic32_sqi_unprepare_hardware;
 
-       ret = devm_spi_register_controller(&pdev->dev, host);
+       ret = spi_register_controller(host);
        if (ret) {
                dev_err(&host->dev, "failed registering spi host\n");
                free_irq(sqi->irq, sqi);
@@ -665,9 +665,15 @@ static void pic32_sqi_remove(struct platform_device *pdev)
 {
        struct pic32_sqi *sqi = platform_get_drvdata(pdev);
 
+       spi_controller_get(sqi->host);
+
+       spi_unregister_controller(sqi->host);
+
        /* release resources */
        free_irq(sqi->irq, sqi);
        ring_desc_ring_free(sqi);
+
+       spi_controller_put(sqi->host);
 }
 
 static const struct of_device_id pic32_sqi_of_ids[] = {