From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3C323ED3DA for ; Wed, 20 May 2026 14:28:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779287294; cv=none; b=L8U8InTrYJFKOPjEukvzA4JS8NXHesGHVpFPieb0mQ85sSPCyq3fcJLxa5A+5quAkKBEVt1F/tkmq15Ilh7KLA2ngF/B5ZnODSX+4alr9QOeWsEPLZngxmDI2dBM9spDTmLHl3darvQKkN9K+C0D5PiBoib6sDCZqI3BpGJ/dhc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779287294; c=relaxed/simple; bh=oaKff5wWPjsVYuS36XSEw6DnNvw/6Divhev5OGiAUyA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rcs9bo/7RcrvVPICxbdV2poccW4TdNtmrzMnSd/72GqAFjCQL5dl0C3Iu+IijANegQED9SV6/IYOIB76nUtVr421VlHBEC76lssghEoiohNZQUrVjjosUMFptkIja0iMwW4a4pWygb4LH/IoRfaEVerONRQ3qpP2lE5BXPO+86o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i75Xu1n1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="i75Xu1n1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1B8F1F00894; Wed, 20 May 2026 14:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779287290; bh=O6UketWHMVyMvpnUtzMqOaCRg/JwhZ9dLA4coqo5RbE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i75Xu1n1IBIGd0w1C1L3E72DFNTMJtpLqR8A2EP1CL3n7yehgnAF+P6L8h1NxEovq PssL3UACzA12kZgSkhIjpH4eyZV7ROKOOO/VnGgaYI+at0S3DWGw1CH8+P1LKjHpc1 3o3yVFKDiD6YHdOsyNtLU0kDEMQhdEcoGw4TFJbP8/1Pue1Fm0X8ld5HUTBR8N2jQr cUR3XM7v3nxtyEfOuoS2EVc4OlNyhObNdfbLy2/pmXoeLiI6CB1KQQ76afBUb8Rrel qYRydwDIcyeLsFIoKZrhKVvn4S98/Y7zwazfopqhF+l+7egX2L3LDU6hz4aABdrFPM 8mt/zbWCk9MZg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Hauke Mehrtens , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y] spi: lantiq-ssc: fix controller deregistration Date: Wed, 20 May 2026 10:28:08 -0400 Message-ID: <20260520142808.3647890-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051542-chamomile-silenced-f4e4@gregkh> References: <2026051542-chamomile-silenced-f4e4@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ 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 --- 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 aae26f62ea87a..686b64cc83eb4 100644 --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c @@ -997,7 +997,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; @@ -1021,6 +1021,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); @@ -1031,6 +1035,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; } -- 2.53.0