]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: mpc52xx: fix controller deregistration
authorJohan Hovold <johan@kernel.org>
Tue, 14 Apr 2026 13:43:14 +0000 (15:43 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 20 Apr 2026 11:39:26 +0000 (12:39 +0100)
Make sure to deregister the controller before disabling and releasing
underlying resources like interrupts and gpios during driver unbind.

Fixes: 42bbb70980f3 ("powerpc/5200: Add mpc5200-spi (non-PSC) device driver")
Fixes: b8d4e2ce60b6 ("mpc52xx_spi: add gpio chipselect")
Cc: stable@vger.kernel.org # 2.6.33
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260414134319.978196-4-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mpc52xx.c

index 05bbd3795e7d802e559bf8a85551712f5b0cd380..823b49f8ece2a261815969a99cac074b286d0b72 100644 (file)
@@ -517,6 +517,8 @@ static void mpc52xx_spi_remove(struct platform_device *op)
        struct mpc52xx_spi *ms = spi_controller_get_devdata(host);
        int i;
 
+       spi_unregister_controller(host);
+
        cancel_work_sync(&ms->work);
        free_irq(ms->irq0, ms);
        free_irq(ms->irq1, ms);
@@ -525,7 +527,6 @@ static void mpc52xx_spi_remove(struct platform_device *op)
                gpiod_put(ms->gpio_cs[i]);
 
        kfree(ms->gpio_cs);
-       spi_unregister_controller(host);
        iounmap(ms->regs);
        spi_controller_put(host);
 }