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 CEA1025333F for ; Wed, 20 May 2026 14:28:00 +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=1779287282; cv=none; b=qUr+oYkgAg6p8sHtvgfBXvycctOxWegFaJlvjI9fKGXx8k1WWVB0qKQD9zJfr1xsh6A782qIX/ui4zI1PIetUgdyRug4VN90R8MzEtlnqZzcaUyR/2xT/VnXeqrC1+N/19iMam9B6oW4sKRphym4m/+NAirkYt+SAjZTJNLNdbE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779287282; c=relaxed/simple; bh=IyZTt+fabuviOvpKCywK3vBBvIXPBLro9Rkt+RpEbaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lNiIuMMladfjc0TllHBTpdjMua4+6ceKts3t6t6tveuhA48V2A0JVgTbLE2R33lkDI/ly02KEZHnFLxTIPAsuXd4e3iteND2Hr5KbwcSiMfQBylqHUYARxoB9VELsUAZu1sadhrcHInBhpoRyMo+byGK13QGv3OHkhjz6p8zEC8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EYwzYPMz; 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="EYwzYPMz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B39901F00894; Wed, 20 May 2026 14:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779287279; bh=y3erZfHkI+/9SJyRBi2leGwWrEzPOSQhGyCOkBl0fy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EYwzYPMz3KDZ2t303Vk1xgsDU2Sw+6XM5glCtT2JmOcK++tqi2egq0fdqVx9N5Nu4 rkp+4aZgduj4ELZ/6zWXrZ9Hj8nuDSTMafTrm98JzJlHYs0u09Sz2hO23IoLFUfVlW 72OuXtK16Fq2rOKt/FgJBik50yohyx2cYgDCi+2uHvI10NzgPVFZEPxa3lk3thUlQF cHM4AOEWwdefjN21SXjZsgGORnusn43daHmoO3a0Om23s+mUDqSBFpggbas4wD+U+z hbKoLwqTdsSwi8Dqer1KyvV4R7HIo4mjm0Nxay4ogkzuuuQrw64NR5OYfQY7swTnKp x+kBX9G/8harQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Lee Jones , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y] spi: st-ssc4: fix controller deregistration Date: Wed, 20 May 2026 10:27:57 -0400 Message-ID: <20260520142757.3647294-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051547-overturn-uncooked-4d7f@gregkh> References: <2026051547-overturn-uncooked-4d7f@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 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 [ changed spi_controller/host API calls to spi_master/master equivalents ] 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 6c44dda9ee8c5..f453e3c1a26b9 100644 --- a/drivers/spi/spi-st-ssc4.c +++ b/drivers/spi/spi-st-ssc4.c @@ -372,7 +372,7 @@ static int spi_st_probe(struct platform_device *pdev) platform_set_drvdata(pdev, master); - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) { dev_err(&pdev->dev, "Failed to register master\n"); goto rpm_disable; @@ -394,10 +394,16 @@ static int spi_st_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct spi_st *spi_st = spi_master_get_devdata(master); + spi_master_get(master); + + spi_unregister_master(master); + pm_runtime_disable(&pdev->dev); clk_disable_unprepare(spi_st->clk); + spi_master_put(master); + pinctrl_pm_select_sleep_state(&pdev->dev); return 0; -- 2.53.0