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 1ED5A3A426D for ; Wed, 13 May 2026 18:20:53 +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=1778696454; cv=none; b=OwaQcPXSouZa8ktKWSMwCDLza+UaVFt5Ue/aqY3LACDH964ZZgyXZyPCEVj/RCGOYpVtHqjbxpRYo0gdya7JgefDnzQGYLpl2h6g8NM0SSDr+/Wp7BMCzNkzc9iXRPXlnblV/iW1BJlGyOavmkEltDPUrLcNALE9g/iCFksnsBU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778696454; c=relaxed/simple; bh=ECUfdJOF5sx/Lwk+jawY2WKGn7NqF+yoSu6V1IYz4UI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P4BinG5LpgzAKrkIs2oWTR7OuI4E7WfmnkgPcAt2+WuN51P3I1RlStrH6Qpw1zAiQTNPF7p9y6FUBKXViZHUAgkJil7A0NjfhKyHusCDj1sR7zn7gA+52H9/aXxIxM+K6+2NGTRMV/wfCutrRTgMljQ9zrbwMDphK3i3kaub9J4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L0ZSV06X; 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="L0ZSV06X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E317AC19425; Wed, 13 May 2026 18:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778696453; bh=ECUfdJOF5sx/Lwk+jawY2WKGn7NqF+yoSu6V1IYz4UI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L0ZSV06XOcTt5cno05jNO+YbFuTBsoLNKesonkXQq/SWTn4Ij1STem3RGirOYGomF np+egHPQKFN9NlOc/SG7/7Ug6jvd8Nb9bXYVqxv4nSA1ce+8ErFCp8liy1ipWUV3Ut K1bXZRVEZ9R7agCW5Y+roJq24UJ9zRds72A6dhZjEYmJoBE4XPGcBMIIiICy4AivWy bJ61l0LpyISKD1l1QB1k+uNztn/ZaVex0YOrPLx+ne9pfVjh8k6SB8nhEmw4tTEPxG xs9h+qtpXWYPy7xjVXqbfJlTxV2baT6ci8rKwQtPLpvJfu6IwhLGFb7tLIVEkwipfI Tf1wLpMW12atA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Maxime Ripard , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y] spi: sun4i: fix controller deregistration Date: Wed, 13 May 2026 14:20:50 -0400 Message-ID: <20260513182050.3919910-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051253-uniformed-shortwave-2407@gregkh> References: <2026051253-uniformed-shortwave-2407@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 42108a2f03e0fdeabe9d02d085bdb058baa1189f ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: b5f6517948cc ("spi: sunxi: Add Allwinner A10 SPI controller driver") Cc: stable@vger.kernel.org # 3.15 Cc: Maxime Ripard Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-19-johan@kernel.org Signed-off-by: Mark Brown [ renamed `host`/`spi_controller` to `master`/`spi_master` and kept `int` return type with `return 0` in remove ] Signed-off-by: Sasha Levin --- drivers/spi/spi-sun4i.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c index a8fba310d7004..ab99cc7438652 100644 --- a/drivers/spi/spi-sun4i.c +++ b/drivers/spi/spi-sun4i.c @@ -503,7 +503,7 @@ static int sun4i_spi_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); pm_runtime_idle(&pdev->dev); - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) { dev_err(&pdev->dev, "cannot register SPI master\n"); goto err_pm_disable; @@ -521,8 +521,16 @@ static int sun4i_spi_probe(struct platform_device *pdev) static int sun4i_spi_remove(struct platform_device *pdev) { + struct spi_master *master = platform_get_drvdata(pdev); + + spi_master_get(master); + + spi_unregister_master(master); + pm_runtime_force_suspend(&pdev->dev); + spi_master_put(master); + return 0; } -- 2.53.0