From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0C6DE387345 for ; Wed, 13 May 2026 18:20:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778696440; cv=none; b=r+A50F+8jVMPGtD9La54ZakjbTGYM5fXYu19dwdP6PNX2c2/TC0UuKa8SywtbTiZH3Q1RbSiJ+rIN2h7i8aUaSF1FxTeWtZETik9lH5qGc196p/UW6sR+h1ZBJAEb94NTsBZmv23DuQYvILNDIVxGGxlgFDs+bcsoILS4wzACSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778696440; c=relaxed/simple; bh=MU20TOvr9sTBX6bUmd9qWSI/ecCxRjPKCFo+Kdr4A9g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gqZVk9AcuZLBtilMSYPbK/+wzMrZhj0BLty8Rd7xzFhKVm3CgV3Hm7iz8sa3MSKoFFGg7S89rv1aOUAnF/kkkjP8qfjOpZaUB6MdWKtHT6u81r1ieSKPYFMkYbQcXLYd+chBk1ZoRTn309J5/JMDhD/8vW8ZZ9eB70QO5+dLmIY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K/7Vg6d+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K/7Vg6d+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25A20C19425; Wed, 13 May 2026 18:20:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778696439; bh=MU20TOvr9sTBX6bUmd9qWSI/ecCxRjPKCFo+Kdr4A9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K/7Vg6d+hiF2YmwReHq7kmtdyI55Qowf8tfiihDdjWw0u9u9EJdq5ZrBqM/uqS+ut NK7sDvGfDMtuZ0lPYsaJH+reKlghF55OucIWPFHWVNuz3/zlpcuMcXxbQ2vNU2l0p/ gUysXflvugI5FCrgT9GZz2gO5A2lBsl9GbGGNdhXMEcueW2wadp2dgepzwPpa/WrOr h91CokWxZtRMU0CvncITZ7HMUlwZcY8b6xXKgEwFLOCxRqHxU6UEJiGjN9h8FAwJxN gMQzNCzGhZxNz0VHdyPCZN+8cEvgG0m0qWG1x8V6xmqNvhiFcYXeT2KJJP+S6heNQD C7sFe2jFWvLKA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Masahisa Kojima , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y] spi: syncuacer: fix controller deregistration Date: Wed, 13 May 2026 14:20:37 -0400 Message-ID: <20260513182037.3918900-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051242-wife-blandness-fbd9@gregkh> References: <2026051242-wife-blandness-fbd9@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 75d849c3452e9611de031db45b3149ba9a99035f ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b0823ee35cf9 ("spi: Add spi driver for Socionext SynQuacer platform") Cc: stable@vger.kernel.org # 5.3 Cc: Masahisa Kojima Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-21-johan@kernel.org Signed-off-by: Mark Brown [ renamed spi_controller/host to spi_master/master and kept int return type with `return 0;` ] Signed-off-by: Sasha Levin --- drivers/spi/spi-synquacer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c index dc188f9202c97..4422fe9d92ff9 100644 --- a/drivers/spi/spi-synquacer.c +++ b/drivers/spi/spi-synquacer.c @@ -719,7 +719,7 @@ static int synquacer_spi_probe(struct platform_device *pdev) pm_runtime_set_active(sspi->dev); pm_runtime_enable(sspi->dev); - ret = devm_spi_register_master(sspi->dev, master); + ret = spi_register_master(master); if (ret) goto disable_pm; @@ -740,10 +740,16 @@ static int synquacer_spi_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct synquacer_spi *sspi = spi_master_get_devdata(master); + spi_master_get(master); + + spi_unregister_master(master); + pm_runtime_disable(sspi->dev); clk_disable_unprepare(sspi->clk); + spi_master_put(master); + return 0; } -- 2.53.0