Skip to content

Commit 904ff4e

Browse files
jhovoldgregkh
authored andcommitted
spi: syncuacer: fix controller deregistration
[ Upstream commit 75d849c ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b0823ee ("spi: Add spi driver for Socionext SynQuacer platform") Cc: stable@vger.kernel.org # 5.3 Cc: Masahisa Kojima <masahisa.kojima@linaro.org> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-21-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5bbe699 commit 904ff4e

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-synquacer.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ static int synquacer_spi_probe(struct platform_device *pdev)
719719
pm_runtime_set_active(sspi->dev);
720720
pm_runtime_enable(sspi->dev);
721721

722-
ret = devm_spi_register_controller(sspi->dev, host);
722+
ret = spi_register_controller(host);
723723
if (ret)
724724
goto disable_pm;
725725

@@ -740,9 +740,15 @@ static void synquacer_spi_remove(struct platform_device *pdev)
740740
struct spi_controller *host = platform_get_drvdata(pdev);
741741
struct synquacer_spi *sspi = spi_controller_get_devdata(host);
742742

743+
spi_controller_get(host);
744+
745+
spi_unregister_controller(host);
746+
743747
pm_runtime_disable(sspi->dev);
744748

745749
clk_disable_unprepare(sspi->clk);
750+
751+
spi_controller_put(host);
746752
}
747753

748754
static int __maybe_unused synquacer_spi_suspend(struct device *dev)

0 commit comments

Comments
 (0)