Skip to content

Commit 9c9c27f

Browse files
jhovoldbroonie
authored andcommitted
spi: tegra114: fix controller deregistration
Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 5c80964 ("spi: tegra114: use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.13 Cc: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-22-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 75d849c commit 9c9c27f

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-tegra114.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ static int tegra_spi_probe(struct platform_device *pdev)
14151415
goto exit_pm_disable;
14161416
}
14171417

1418-
ret = devm_spi_register_controller(&pdev->dev, host);
1418+
ret = spi_register_controller(host);
14191419
if (ret < 0) {
14201420
dev_err(&pdev->dev, "can not register to host err %d\n", ret);
14211421
goto exit_free_irq;
@@ -1441,6 +1441,10 @@ static void tegra_spi_remove(struct platform_device *pdev)
14411441
struct spi_controller *host = platform_get_drvdata(pdev);
14421442
struct tegra_spi_data *tspi = spi_controller_get_devdata(host);
14431443

1444+
spi_controller_get(host);
1445+
1446+
spi_unregister_controller(host);
1447+
14441448
free_irq(tspi->irq, tspi);
14451449

14461450
if (tspi->tx_dma_chan)
@@ -1452,6 +1456,8 @@ static void tegra_spi_remove(struct platform_device *pdev)
14521456
pm_runtime_disable(&pdev->dev);
14531457
if (!pm_runtime_status_suspended(&pdev->dev))
14541458
tegra_spi_runtime_suspend(&pdev->dev);
1459+
1460+
spi_controller_put(host);
14551461
}
14561462

14571463
#ifdef CONFIG_PM_SLEEP

0 commit comments

Comments
 (0)