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 26D0232E13B; Tue, 16 Jun 2026 18:36:27 +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=1781634989; cv=none; b=Kv/LBUH5iRcKIsSv7NhcSAj91EuDsSTKVVpNbhYpUxLYDIwbIPElWgMGr0Xmf75KE2B/GLz4DYbDpeLAeBlkwjFA3iHNFcKtHkgL3MatBYkIdAKn6LPpTK/vpHpMhu1o02ws+8z7yiZt9ENLKRqO08coMTA57R64ch40A520wXI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781634989; c=relaxed/simple; bh=E5WW6cwY+cT5j8Ka/rF8Y59RJWLv+rKjE0DFTrruYKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M//GomM3cZoWwTDCpK15apLpuk39iD2DDnUsxYcsss7qGhSK6XNmzP83VYbyWUuU/gQ6tyKA9Ql+LTE6OCuyYQN3BSAVWWa3WjvVCna3S5OZ6p67Xqfit4Rz7bOggtb7dZt/HEfyjnCIczqWv4FogqG6FxdxIjaSlCGzn4vOYwI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IMj3WntF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IMj3WntF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBE001F00A3A; Tue, 16 Jun 2026 18:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781634987; bh=wH9QXsBmtDdQZgeNFc5gRmpJE4LJZtpzFt0lWprSyGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IMj3WntFkymyA2ygIKCSutLNunEErGz09B9WUJDq++PfxN07rS7tvFSSEGYUX1976 e2RptdICxGys2Uoximm/qiqKawVVn+DT6dp4w2N6PpTkugJFrEm4b3tdyQhw3D776d jmCoOAlH3x8jbSsCCt4djMKzodMR8Fepb047luKE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hauke Mehrtens , Johan Hovold , Mark Brown , Sasha Levin Subject: [PATCH 5.15 336/411] spi: lantiq-ssc: fix controller deregistration Date: Tue, 16 Jun 2026 20:29:34 +0530 Message-ID: <20260616145119.038612784@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145100.376842714@linuxfoundation.org> References: <20260616145100.376842714@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-lantiq-ssc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c @@ -1003,7 +1003,7 @@ static int lantiq_ssc_probe(struct platf "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; @@ -1027,6 +1027,10 @@ static int lantiq_ssc_remove(struct plat { 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); @@ -1037,6 +1041,8 @@ static int lantiq_ssc_remove(struct plat clk_disable_unprepare(spi->spi_clk); clk_put(spi->fpi_clk); + spi_master_put(spi->master); + return 0; }