Skip to content

Commit a786ce0

Browse files
jhovoldgregkh
authored andcommitted
spi: sun6i: fix controller deregistration
commit d874a1c upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ae60afa commit a786ce0

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
@@ -743,7 +743,7 @@ static int sun6i_spi_probe(struct platform_device *pdev)
743743
pm_runtime_set_active(&pdev->dev);
744744
pm_runtime_enable(&pdev->dev);
745745

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

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

774778
if (host->dma_tx)
775779
dma_release_channel(host->dma_tx);
776780
if (host->dma_rx)
777781
dma_release_channel(host->dma_rx);
782+
783+
spi_controller_put(host);
778784
}
779785

780786
static const struct sun6i_spi_cfg sun6i_a31_spi_cfg = {

0 commit comments

Comments
 (0)