Skip to content

Commit d874a1c

Browse files
jhovoldbroonie
authored andcommitted
spi: sun6i: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 3558fe9 ("spi: sunxi: Add Allwinner A31 SPI controller driver") Cc: stable@vger.kernel.org # 3.15 Cc: Maxime Ripard <mripard@kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-20-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 42108a2 commit d874a1c

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-sun6i.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ static int sun6i_spi_probe(struct platform_device *pdev)
742742
pm_runtime_set_active(&pdev->dev);
743743
pm_runtime_enable(&pdev->dev);
744744

745-
ret = devm_spi_register_controller(&pdev->dev, host);
745+
ret = spi_register_controller(host);
746746
if (ret) {
747747
dev_err(&pdev->dev, "cannot register SPI host\n");
748748
goto err_pm_disable;
@@ -768,12 +768,18 @@ static void sun6i_spi_remove(struct platform_device *pdev)
768768
{
769769
struct spi_controller *host = platform_get_drvdata(pdev);
770770

771+
spi_controller_get(host);
772+
773+
spi_unregister_controller(host);
774+
771775
pm_runtime_force_suspend(&pdev->dev);
772776

773777
if (host->dma_tx)
774778
dma_release_channel(host->dma_tx);
775779
if (host->dma_rx)
776780
dma_release_channel(host->dma_rx);
781+
782+
spi_controller_put(host);
777783
}
778784

779785
static const struct sun6i_spi_cfg sun6i_a31_spi_cfg = {

0 commit comments

Comments
 (0)