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 A5A10399D1E for ; Tue, 12 May 2026 12:47:10 +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=1778590030; cv=none; b=AUhglEsyyJw9NbxSdjh/LiXSx/jRIUBgIvi0kkME/H/XRs1cVjDCUUCqNkFP5LNPU5fwL0aHYNe3OrMwue/A9MR2pNBqONvXYBpD5XCRNBNlRNMdgurYalwZlyYkUMVFisKh7vU7v9ruTWTccMN0Xq4pPpxrJ4tlw3Trc0OyddQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778590030; c=relaxed/simple; bh=KMZCxhU/CWqqufKF+DxMA/0hL2oMLygyhbkeBe6+HfQ=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=JART0xfY8AJJtIRcetA0mzdpyvrc5/QWhtHJyB2O+pbuJuoRNddVFjNYeeIv//CsxSct1RnIMkrgKQ6w4VzkjMHut9h9+bccO90/FQ1u2+471Kz6oyVEefs9AeMBdkcqN+12jNTBEdcd93x1FXsNdkdarwgHbmm/3X6t2JiFLAk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=M6NByqpn; 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="M6NByqpn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE2BBC2BCB0; Tue, 12 May 2026 12:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778590030; bh=KMZCxhU/CWqqufKF+DxMA/0hL2oMLygyhbkeBe6+HfQ=; h=Subject:To:Cc:From:Date:From; b=M6NByqpnIsbYfp2qH29qTYlibX1+OyuKJWVo+HXcKkY1mdp0BBnELVpCCrr4M6l4B yNCgumbYVU7OAMteDanMGOO7MxV52fnk/MqIRTDsMv1U6hYSa1sQ/Lrv/+RjaMpHrQ ADCyEaz2CxU0hjzNzGItxnV1DWILXdZ0NhNhHfL0= Subject: FAILED: patch "[PATCH] spi: sun4i: fix controller deregistration" failed to apply to 5.15-stable tree To: johan@kernel.org,broonie@kernel.org,mripard@kernel.org Cc: From: Date: Tue, 12 May 2026 14:45:53 +0200 Message-ID: <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-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 42108a2f03e0fdeabe9d02d085bdb058baa1189f # git commit -s git send-email --to '' --in-reply-to '2026051253-uniformed-shortwave-2407@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 42108a2f03e0fdeabe9d02d085bdb058baa1189f Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:48 +0200 Subject: [PATCH] spi: sun4i: fix controller deregistration 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 diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c index bfdf419a583c..b7fbb5270edb 100644 --- a/drivers/spi/spi-sun4i.c +++ b/drivers/spi/spi-sun4i.c @@ -504,7 +504,7 @@ static int sun4i_spi_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); pm_runtime_idle(&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; @@ -522,7 +522,15 @@ static int sun4i_spi_probe(struct platform_device *pdev) static void sun4i_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); + + spi_controller_put(host); } static const struct of_device_id sun4i_spi_match[] = {