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 738FB3DCD99 for ; Wed, 20 May 2026 13:11:39 +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=1779282703; cv=none; b=EyjVc7h4NejZ8IxlrqjMnRHseVW06o/fEKS7XlCvQf9PSfOOiXM/z2YapiLrArr3EZPAspYDUaRi1xQFBKH7mmTEu4/lN2Li5U19Pt8BzR1wMaoQodhLdys52QSjn3ijBlzm2OxJqctdwneLd6QnPmXHt30TuWK3Xg+pzjYpeSY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282703; c=relaxed/simple; bh=a+SVtV79zVAJjKdIkAyVUjvDYeAoEGNIifEqAqB8eV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EIcHJYJqx6j3IG7Npg6uKsRjqzUeVMr9Un0AVYK9goayns8X1gz52jxy86bcUoo4DJQ9+P1+UTPezqGjtsrYIQ+ChslWJ7NyPE5rn3smnLWI3T9UsJo9Gxb6mi5dFFJkxYvRYLcndkiuFKzsMSbu8PvHkgMLtROoNcqSAD3DIBQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W1A0fN/u; 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="W1A0fN/u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5AEE1F00896; Wed, 20 May 2026 13:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779282696; bh=/QmJf5D+otcuSlcoqyxhXn9fqSRc9yrrZEKMCFBB84w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W1A0fN/u0jUmU6K3dXDzJ59LQs5BP6JNhGmIMTLr5wUx/SplHQoKVIzGeEivV0PV7 izBRMTcJtWNmSrAEpp1HnKWQdCNDoQ8x+gn3rtInLrlSUcm9Slwb4f20dGf8N54uBD y+fZ+h6J/KwdAjxuGt4W0RaRfwTZrHJFMaNNoIa14W5lwoIRMEK6WQMXgzpVHqRo+V ndMG7+puPuObHUDgOCkcc9mmm+QTfo5Afx53eJdgSj+4Umhf76ZSsjC3Pn8p//6FKX dM5u4uEX5/bcrbs2Ha6fX4cEz+WULIOLYBVs7Z0QHaNFKc975dW/lk0ujv5IlFmTrj yKFcPTInGEvxw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Lee Jones , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y 2/2] spi: st-ssc4: fix controller deregistration Date: Wed, 20 May 2026 09:11:33 -0400 Message-ID: <20260520131133.3608592-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260520131133.3608592-1-sashal@kernel.org> References: <2026051546-drinkable-guru-5feb@gregkh> <20260520131133.3608592-1-sashal@kernel.org> 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 19857374010d06ca6a2f7c2c53464122eb804df0 ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 9e862375c542 ("spi: Add new driver for STMicroelectronics' SPI Controller") Cc: stable@vger.kernel.org # 4.0 Cc: Lee Jones Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-18-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-st-ssc4.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c index 6dca8e60336c2..e7111ce2b58c3 100644 --- a/drivers/spi/spi-st-ssc4.c +++ b/drivers/spi/spi-st-ssc4.c @@ -349,7 +349,7 @@ static int spi_st_probe(struct platform_device *pdev) platform_set_drvdata(pdev, host); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(&pdev->dev, "Failed to register host\n"); goto rpm_disable; @@ -371,10 +371,16 @@ static int spi_st_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct spi_st *spi_st = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(spi_st->clk); + spi_controller_put(host); + pinctrl_pm_select_sleep_state(&pdev->dev); return 0; -- 2.53.0