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 779593F0A94 for ; Fri, 15 May 2026 07:37:58 +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=1778830678; cv=none; b=nhle9WlSfWRswwbiqBuhXvHPnSM493gaV9JWy8gk9ArHq2Jj8+EUEaV2Vq/WQXtvHchO9Idx3V89SUL61CqIy+qvMmm5HshaWXdlsKFZKAO5kAmMgFMG/QzVbk9ryu0N+D8SMMRH7N9OvHU9ZFlDYa8CrPucLuSf65ZJtdetmDs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778830678; c=relaxed/simple; bh=SBzAHFRrjK4MpPI2hxGu4VG9r6ejWbtDHNIGqnSvEBI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=dFGOwjlsrpbiS2ZuxUE/iJz2SlOS2qQmUGYTRn6/0YRTL9X2VWsxgvzKuP3BrpKucBVRf0C9oaYpXe1t027C/jNIU5Gs7NH87JcurMrxkTw84iDkBXEXH+8/3pcZkLIWJE5z8dnSAQ3i/DwEGLTOYlaOlZTPjLACL/nr2XYdy90= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=i4ONc3QP; 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="i4ONc3QP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 218C9C2BCB0; Fri, 15 May 2026 07:37:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778830677; bh=SBzAHFRrjK4MpPI2hxGu4VG9r6ejWbtDHNIGqnSvEBI=; h=Subject:To:Cc:From:Date:From; b=i4ONc3QPLidANCFuCP853h1pu7k8WfvszsYTpMu/3JZ5IsLCYpfkcWLhfcO4Hvk8F u6sgZTco952zJTGLXhq9sxSNg97j80gbzAMKUk/UfWeY+K3k5wZIpxhwF8u0FKwKtK v/3kAoZ1Yc/MWusCQ0V6FtWmEBd60VdieWrF4LkA= Subject: FAILED: patch "[PATCH] spi: mt65xx: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,leilk.liu@mediatek.com Cc: From: Date: Fri, 15 May 2026 09:37:50 +0200 Message-ID: <2026051550-capped-fence-0a89@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 2ad30599cccc572ba2fc11010670eb6e01ea6bfc # git commit -s git send-email --to '' --in-reply-to '2026051550-capped-fence-0a89@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 2ad30599cccc572ba2fc11010670eb6e01ea6bfc Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:31 +0200 Subject: [PATCH] spi: mt65xx: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: a568231f4632 ("spi: mediatek: Add spi bus for Mediatek MT8173") Cc: stable@vger.kernel.org # 4.3: ace145802350 Cc: stable@vger.kernel.org # 4.3 Cc: Leilk Liu Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-2-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index 0368a26bca9a..96f8555be983 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c @@ -1325,7 +1325,7 @@ static int mtk_spi_probe(struct platform_device *pdev) pm_runtime_enable(dev); - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret) { pm_runtime_disable(dev); return dev_err_probe(dev, ret, "failed to register host\n"); @@ -1340,6 +1340,8 @@ static void mtk_spi_remove(struct platform_device *pdev) struct mtk_spi *mdata = spi_controller_get_devdata(host); int ret; + spi_unregister_controller(host); + cpu_latency_qos_remove_request(&mdata->qos_request); if (mdata->use_spimem && !completion_done(&mdata->spimem_done)) complete(&mdata->spimem_done);