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

Fixes: b942d80b0a39 ("spi: Add MXIC controller driver")
Cc: stable@vger.kernel.org # 5.0: cc53711b2191
Cc: stable@vger.kernel.org # 5.0
Cc: Mason Yang <masonccyang@mxic.com.tw>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260414134319.978196-6-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mxic.c

index f9369c69911c2283c227b54b021f1eee2b8f71d1..b0e7fc828a5098c4857ccbfac9478300f9747b54 100644 (file)
@@ -832,9 +832,10 @@ static void mxic_spi_remove(struct platform_device *pdev)
        struct spi_controller *host = platform_get_drvdata(pdev);
        struct mxic_spi *mxic = spi_controller_get_devdata(host);
 
+       spi_unregister_controller(host);
+
        pm_runtime_disable(&pdev->dev);
        mxic_spi_mem_ecc_remove(mxic);
-       spi_unregister_controller(host);
 }
 
 static const struct of_device_id mxic_spi_of_ids[] = {