Skip to content

Commit 4ea9a1a

Browse files
jhovoldgregkh
authored andcommitted
spi: omap2-mcspi: fix controller deregistration
commit fb45f95 upstream. Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: ccdc7bf ("SPI: omap2_mcspi driver") Cc: stable@vger.kernel.org # 2.6.23 Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-6-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 89c0a77 commit 4ea9a1a

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-omap2-mcspi.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
15411541
if (status < 0)
15421542
goto disable_pm;
15431543

1544-
status = devm_spi_register_controller(&pdev->dev, ctlr);
1544+
status = spi_register_controller(ctlr);
15451545
if (status < 0)
15461546
goto disable_pm;
15471547

@@ -1562,11 +1562,17 @@ static void omap2_mcspi_remove(struct platform_device *pdev)
15621562
struct spi_controller *ctlr = platform_get_drvdata(pdev);
15631563
struct omap2_mcspi *mcspi = spi_controller_get_devdata(ctlr);
15641564

1565+
spi_controller_get(ctlr);
1566+
1567+
spi_unregister_controller(ctlr);
1568+
15651569
omap2_mcspi_release_dma(ctlr);
15661570

15671571
pm_runtime_dont_use_autosuspend(mcspi->dev);
15681572
pm_runtime_put_sync(mcspi->dev);
15691573
pm_runtime_disable(&pdev->dev);
1574+
1575+
spi_controller_put(ctlr);
15701576
}
15711577

15721578
/* work with hotplug and coldplug */

0 commit comments

Comments
 (0)