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 589DA3F9A05 for ; Wed, 20 May 2026 15:18:26 +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=1779290307; cv=none; b=StHuMerCnrei4kknpppGSWRyRT3eeoTrN5/imXLaWMRH8nvkDGtM61GT9N4Uqk3sbpboSlC0+lV9BJENbBeVUOoD4SL9xyZUBIyknCfBbXTFQUsu/+IMc5SiCxyEfO5DmKu7epB+nlXLjVPzgGdaAr5f4oJVqFvVby95AoRNbLo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779290307; c=relaxed/simple; bh=IyZTt+fabuviOvpKCywK3vBBvIXPBLro9Rkt+RpEbaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qktImqRHom5yL7f+aXS9319tWeF2wxlZvZDGvPP977RMejPkeW4pYOp87cuXjinEqrN10zKh/0KAqawPURzN4uxt46geus91YOSYziK1G/vqKkV+hsfXY556DORviA4IUcv4EcOu5PV9/iVj0X56+vpiJdgO6eJMCMV1a3ZBdok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ozb0XMCw; 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="ozb0XMCw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CF121F000E9; Wed, 20 May 2026 15:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779290306; bh=y3erZfHkI+/9SJyRBi2leGwWrEzPOSQhGyCOkBl0fy4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ozb0XMCwH367Yi3ilQk8qOGy48gXsXYj3Es29aXZy2FjOA+gheo0XiN780cEJKX6Z myLk22CEakfQeDz2u1H94qPf2p7ZUPP/NufRVAaLhw+F+/aeuNDv/QB8cqeRZD5S4G ZDCvf609+OMXz3msNQJlwiOVBV1Wrs6SrCQ338HGgAhFfZXpas2+EftzjbVTnXM3uY Nm9bWn2tn7Quyz685nJp9z72O5LPwucVn+FWbTnr8kRX4EAxUViPGxrku/Zh5n9cbz /hWUdI/fxrc4+ImSZXzgFxzEi3E86B6po2ejywITvVwIN3u2GAtQFjKEgic7+BWpDe kSSoBhiBHmD6Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Lee Jones , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: st-ssc4: fix controller deregistration Date: Wed, 20 May 2026 11:18:24 -0400 Message-ID: <20260520151824.3913740-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051547-balcony-dismiss-4a09@gregkh> References: <2026051547-balcony-dismiss-4a09@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