Unverified Commit ab840cbd authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: slave-mt27xx: fix controller deregistration



Make sure to deregister the controller before disabling underlying
resources like clocks (by disabling runtime PM) during driver unbind.

Fixes: 805be7dd ("spi: mediatek: add spi slave for Mediatek MT2712")
Cc: stable@vger.kernel.org	# 4.20
Cc: Leilk Liu <leilk.liu@mediatek.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-16-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f252366
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static int mtk_spi_slave_probe(struct platform_device *pdev)

	pm_runtime_enable(&pdev->dev);

	ret = devm_spi_register_controller(&pdev->dev, ctlr);
	ret = spi_register_controller(ctlr);
	clk_disable_unprepare(mdata->spi_clk);
	if (ret) {
		dev_err(&pdev->dev,
@@ -473,7 +473,15 @@ static int mtk_spi_slave_probe(struct platform_device *pdev)

static void mtk_spi_slave_remove(struct platform_device *pdev)
{
	struct spi_controller *ctlr = platform_get_drvdata(pdev);

	spi_controller_get(ctlr);

	spi_unregister_controller(ctlr);

	pm_runtime_disable(&pdev->dev);

	spi_controller_put(ctlr);
}

#ifdef CONFIG_PM_SLEEP