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 39E3E2D876B for ; Thu, 14 May 2026 03:10: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=1778728254; cv=none; b=SNkcUjuWoToI8b0gIoaN+SuXv0xlPLhCaE342TulBulNp7ALWpEIwqsm8P837OCFp/6VzE1xQ0T8pgFs11f5gok/MwzX6jerTn2Loh+XgoshUA9yLUFZau070p+29i8s0+xz12AZuIUSZqQzUWoS1Y53tOZwF6t0g2cpqwaMm4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778728254; c=relaxed/simple; bh=O2x7dfmOfH68Dum5XszZLc4m/ewJl8Ctu40cXfFzSEI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HYEqQ/rtrSY96KxRr8V98XopWVJNW0hMImmrEyqLjISVW/Z2bBYLIYQi69NWVGUQz5V/xeE0TFM/tSmsL0qpgfSmH6X2sEWBofNMvn2oGj3HRYvXjBuyn4nqNLr5so/TRxqOTK12VYRtZqJX+Zl4er+mUieqY2ZLVRTWMDaLCgI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Idgz/Eld; 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="Idgz/Eld" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B6F6C19425; Thu, 14 May 2026 03:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778728253; bh=O2x7dfmOfH68Dum5XszZLc4m/ewJl8Ctu40cXfFzSEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Idgz/EldL/N9G6vAGdc5Eo1eJ0Yyqsk5WAY3szmn/PjcEINT005+7XnhZ6VTHloea 4SZKRBSxVfyAn2xKwjmiT1NF6l9BWEXl73y5hyuB0WqRe7zZEi4IUntVXaNiYCiXmm 2CfBlo6Scpv9u8VGwW51gpA0kHhtmGrXQKRw2QddLSzFo4dTskIPAs3XilJLLjeNhP SrpcpG4cZACj7ottoGa8i3orv1AM2TeyMPpJIq2XytOYOAGhu/CeKf5Xqyd754pEyp V1P9l2vJu1jeG66gAX6i4HM9ltU+Heyyon2SzIE7685eGcUj+Oh2hdSeKfH+vek2XD ZYlNH7F1HrGbw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Maxime Ripard , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y] spi: sun6i: fix controller deregistration Date: Wed, 13 May 2026 23:10:51 -0400 Message-ID: <20260514031051.4119801-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051227-glorifier-undoing-ee5b@gregkh> References: <2026051227-glorifier-undoing-ee5b@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 APIs to spi_master equivalents and kept int return type for sun6i_spi_remove ] Signed-off-by: Sasha Levin --- drivers/spi/spi-sun6i.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index d79853ba7792a..834957bb04ba8 100644 --- a/drivers/spi/spi-sun6i.c +++ b/drivers/spi/spi-sun6i.c @@ -688,7 +688,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_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) { dev_err(&pdev->dev, "cannot register SPI master\n"); goto err_pm_disable; @@ -714,12 +714,19 @@ 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); if (master->dma_tx) dma_release_channel(master->dma_tx); if (master->dma_rx) dma_release_channel(master->dma_rx); + + spi_master_put(master); + return 0; } -- 2.53.0