From bca34c0e0cd68e9c4edab07f02d4db985fe5adea Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 20 May 2026 11:24:08 -0400 Subject: [PATCH] spi: lantiq-ssc: fix controller deregistration [ Upstream commit b99206710d032c16b7f8b75e4bc18414d8e4b9f4 ] Make sure to deregister the controller before releasing underlying resources like clocks during driver unbind. Fixes: 17f84b793c01 ("spi: lantiq-ssc: add support for Lantiq SSC SPI controller") Cc: stable@vger.kernel.org # 4.11 Cc: Hauke Mehrtens Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-17-johan@kernel.org Signed-off-by: Mark Brown [ adapted spi_controller/host naming to spi_master/master and preserved the int-returning remove() with trailing return 0 ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Ulrich Hecht --- drivers/spi/spi-lantiq-ssc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c index dc740b5f720b..d651ee565a7a 100644 --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c @@ -945,7 +945,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev) "Lantiq SSC SPI controller (Rev %i, TXFS %u, RXFS %u, DMA %u)\n", revision, spi->tx_fifo_size, spi->rx_fifo_size, supports_dma); - err = devm_spi_register_master(dev, master); + err = spi_register_master(master); if (err) { dev_err(dev, "failed to register spi_master\n"); goto err_wq_destroy; @@ -969,6 +969,10 @@ static int lantiq_ssc_remove(struct platform_device *pdev) { struct lantiq_ssc_spi *spi = platform_get_drvdata(pdev); + spi_master_get(spi->master); + + spi_unregister_master(spi->master); + lantiq_ssc_writel(spi, 0, LTQ_SPI_IRNEN); lantiq_ssc_writel(spi, 0, LTQ_SPI_CLC); rx_fifo_flush(spi); @@ -979,6 +983,8 @@ static int lantiq_ssc_remove(struct platform_device *pdev) clk_disable_unprepare(spi->spi_clk); clk_put(spi->fpi_clk); + spi_master_put(spi->master); + return 0; }