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 392B3399CFD for ; Tue, 12 May 2026 12:48:00 +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=1778590080; cv=none; b=RMz2VlrEcxJszJzmKXN1qpFnRHGK0UZSMnub2gjftNYdM5gHZMp8IJea9N0+wOKcEqT9lDbBr2ulU4vhC+DGuqN1uw0+LpB3m1IH9o6HfzJ3xMi+6PUipzvwr44snw4cRhQ+85aHCS0JVa0dxOUco6R9US7NHofD1vzVx8Wo5x0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778590080; c=relaxed/simple; bh=CyC2Eb6MasIrTLgnLvGn1N/sFoNaHFtWWLTKFcVg0KY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=IkS2dGd9O+kTRB/3sxOCXtxpcO9l24yOBYuAfEJjXTin+CARUmdKoRV7lA7EJr84g23ojrX/Xe6DXnJzCiIatghx8lytNmgUCzil1bbxMfHUIt5OYFxvChLdkS7yxAMlYVlhStKu69T79/4X8lWJOEO4exst7oZJ8eaTR+jjFt4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xDzPa0Fv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xDzPa0Fv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78ED6C2BCB0; Tue, 12 May 2026 12:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778590080; bh=CyC2Eb6MasIrTLgnLvGn1N/sFoNaHFtWWLTKFcVg0KY=; h=Subject:To:Cc:From:Date:From; b=xDzPa0FvyOo07k3uWUZlOJNSxKBsZeR/toaknDIKM6UvCLlTfnd2K66J1I2l3pVMo vX0nUMfWKKp65fCwlGFoOza1Eb6ep9ZEk3VPrVm0IK1tVcHwVfkwHLGvJ/irWiffp6 0eaoW0j7RLBqu6R77nXCT3tZvpox++cuRyXjbH2w= Subject: FAILED: patch "[PATCH] spi: sun6i: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,mripard@kernel.org Cc: From: Date: Tue, 12 May 2026 14:46:27 +0200 Message-ID: <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-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x d874a1c33aee0d88fb4ba2f8aeadaa9f1965209a # git commit -s git send-email --to '' --in-reply-to '2026051227-glorifier-undoing-ee5b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d874a1c33aee0d88fb4ba2f8aeadaa9f1965209a Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:49 +0200 Subject: [PATCH] spi: sun6i: fix controller deregistration 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 diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c index 240e46f84f7b..5ac73d324d06 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 = {