Skip to content

Commit 91af2ac

Browse files
jhovoldgregkh
authored andcommitted
spi: st-ssc4: fix controller deregistration
commit 1985737 upstream. Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 9e86237 ("spi: Add new driver for STMicroelectronics' SPI Controller") Cc: stable@vger.kernel.org # 4.0 Cc: Lee Jones <lee@kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org> Link: https://patch.msgid.link/20260410081757.503099-18-johan@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 37c8388 commit 91af2ac

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/spi/spi-st-ssc4.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ static int spi_st_probe(struct platform_device *pdev)
349349

350350
platform_set_drvdata(pdev, host);
351351

352-
ret = devm_spi_register_controller(&pdev->dev, host);
352+
ret = spi_register_controller(host);
353353
if (ret) {
354354
dev_err(&pdev->dev, "Failed to register host\n");
355355
goto rpm_disable;
@@ -371,10 +371,16 @@ static void spi_st_remove(struct platform_device *pdev)
371371
struct spi_controller *host = platform_get_drvdata(pdev);
372372
struct spi_st *spi_st = spi_controller_get_devdata(host);
373373

374+
spi_controller_get(host);
375+
376+
spi_unregister_controller(host);
377+
374378
pm_runtime_disable(&pdev->dev);
375379

376380
clk_disable_unprepare(spi_st->clk);
377381

382+
spi_controller_put(host);
383+
378384
pinctrl_pm_select_sleep_state(&pdev->dev);
379385
}
380386

0 commit comments

Comments
 (0)