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 9ADEA1DE894 for ; Thu, 14 May 2026 04:58:49 +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=1778734729; cv=none; b=Fi9Cmwc7nsFSMh1td8qHw7cjfGv2ZcFs/7EpRRDQn+OVGm9BP5+ytaj7KAz6w28svDzepiNaeXTmi9BBNRzm+D5WvosVyKBZ0gy6hFqjUeeaHa/cwJo/Wjw3G5RXob2K5yWzduVg1431FlmAkL0t34vb39zpqMBZtdY6FBHcwDM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778734729; c=relaxed/simple; bh=6R0QAI+5LYwA9k4hn1XXdgT6C2bB6F0AWz8M8p6uzKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZTp+Kig7pf8ugknbAjbRpB22dSWH6BHAuH/qx/a0GHDfEzl71MwGZ+SXbt5oleg+0OHNAYJg8yZTGQnDYSSz+CxTKxIQsv2MOjsC3OstmZ7DjrOt9LwRLxmenBnbQ+rVo58n1wfZbbkF90aQaBpA3t7ORutRiXwPc34D43U0eM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bcl6+RFz; 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="bcl6+RFz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A49C4C2BCB7; Thu, 14 May 2026 04:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778734729; bh=6R0QAI+5LYwA9k4hn1XXdgT6C2bB6F0AWz8M8p6uzKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcl6+RFzKcbS1kZh+SY4On+QkqidWO7LQgs5Tuub99KzgvFnZR5cNRaw1yuiKxlDa sICvf4gY5AlLol3hrYOPg8WSND4sWn79JHDFRwkxaEp6OT3r4lh1V3G1pnpNr9llhq w7q325ekBcXxwmaQAieKgPzx0tY6g9NuvAV4TFC+a0HlpA65l/+Ccx6PTLiojaf1+b NsNxfXzmOiChKsi0f+stag9LE3NoggZwIH+TKDwE4plMxdEvbdl0UyblTs09CTFze8 wDCzTDV8SL3jgwnx6jx7ZyY4I2gX574kltjf4zDHelzHP3ebgsw8ehY0gwzFdJmVk9 mUn3Hb8bcg0cQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Maxime Ripard , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: sun6i: fix controller deregistration Date: Thu, 14 May 2026 00:58:46 -0400 Message-ID: <20260514045846.24524-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051228-exclusive-lethargy-8173@gregkh> References: <2026051228-exclusive-lethargy-8173@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 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 [ renamed spi_controller/host APIs to spi_master APIs, dropped non-existent DMA cleanup, and kept int return type ] Signed-off-by: Sasha Levin --- drivers/spi/spi-sun6i.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index 803d92f8d0316..c0c43290eacb6 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -512,7 +512,7 @@ static int sun6i_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; @@ -530,8 +530,16 @@ static int sun6i_spi_probe(struct platform_device *pdev) static int sun6i_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