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 D1B783C9895 for ; Wed, 13 May 2026 23:05:17 +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=1778713517; cv=none; b=obIdBzf0h8ACQPmkxr4KUMPAXwGm6sIo5CP4iasZtmAYHYGW6g1kIS9IT6bBssUBMTYxBF2tTpiMu5/OODwaHhno2h2Z8QJOeV930nRKLcF9dgHnnWsdsIXrgV3o+lsygIuSJz8PQi40RvAUBBXYBCnxVgslRHdu2LzRhytwQUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778713517; c=relaxed/simple; bh=mp9Yjyip8jJ5fh7DS84KSgnLigNhDCIE2Ct/sesvNGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pd4F+Bt841cTJ3bZx75WJW4SSYF/hGpD6Vif/7LlybDaHNqRSkxGsDHr8kDWfk7EoJrXkxFTtDxKH454nl7eIMsszKqcWryrNTToY+r+lF7bGiicLE47EvE8H41kOs3NlgDNaHCG2QoludEoeW7XAsDtxPppVVhZFLaIKOQZpqM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OOLoWGXy; 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="OOLoWGXy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B25F5C2BCF7; Wed, 13 May 2026 23:05:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778713517; bh=mp9Yjyip8jJ5fh7DS84KSgnLigNhDCIE2Ct/sesvNGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OOLoWGXyS4g2h6M3ngHKSmriDm5T+V84gJyi1FLATiiGQkM6vIDddCpnVDgaLLRyz 6Y2bvZzfL7c+ioeF9FrsELrEDHuDULZ847TZ0Hr3ul23jS0AxZejHkBVK61uMogQw0 8tZDBjLqIRpAkQayvS+5X8jkWBebV7CJpFCcejiyotxcfARhI5bh3QhmkeGYuAiNq0 14ZQwsXlf/NEIutDVjLNwwNJ7Z6/G17nZdWk6rXjmKSPlR2wsl3P4f1En8CNW5M5g3 GDI5zymfGkUWUcrmUMGUEWBvvVeTaAKGpkg31Boxn+G9brmb4ylyOtGLKwiIdhgg5x qXTCDkgvNDxiA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Maxime Ripard , Mark Brown , Sasha Levin Subject: [PATCH 6.6.y 2/2] spi: sun6i: fix controller deregistration Date: Wed, 13 May 2026 19:05:13 -0400 Message-ID: <20260513230513.4027915-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513230513.4027915-1-sashal@kernel.org> References: <2026051227-endorphin-facedown-91d1@gregkh> <20260513230513.4027915-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 d874a1c33aee0d88fb4ba2f8aeadaa9f1965209a ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 3558fe900e8a ("spi: sunxi: Add Allwinner A31 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-20-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-sun6i.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index cd018ea1abf14..c5655e3438c6c 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -742,7 +742,7 @@ static int sun6i_spi_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(&pdev->dev, "cannot register SPI host\n"); goto err_pm_disable; @@ -768,12 +768,18 @@ static void sun6i_spi_remove(struct platform_device *pdev) { struct spi_controller *host = platform_get_drvdata(pdev); + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_force_suspend(&pdev->dev); if (host->dma_tx) dma_release_channel(host->dma_tx); if (host->dma_rx) dma_release_channel(host->dma_rx); + + spi_controller_put(host); } static const struct sun6i_spi_cfg sun6i_a31_spi_cfg = { -- 2.53.0