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 040483290B8 for ; Fri, 15 May 2026 07:37:44 +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=1778830665; cv=none; b=BULfSMjCEc+slhN+QI38hGIZ7P1X6JsKv6uHIuyjnZJrPpEPtK0yysfhxRJAYU/6VOfWKiUldbJhpBrZL7fSf7LxTjDYpFjEjvGftA/9yAKhBBQI88VT1Ey13AMOhs2NIyLTd2FugmItGWxNfO5dPo//YOElBQaRYS8Vu/fiB4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778830665; c=relaxed/simple; bh=d8Z0bp5KrVQDBZfs7+Ma0qPzGEkqHB+mvK+QWSgRmfc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ZXmhEv9L8S9KqsUHtEtngOQu0NWmwz20b5u2I0QIxy9cOs2BapMcHwUx/XDuUe74o+or3Cbqzv9o8QrEILGY80O8m7O3RoHB8MrOOZMrFS3XqF611Y5LSlOEgqk92jN2xFhMc+28mqb8YeUlSS51TdfdVoyh6tBYy9LvzmgGYa0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XC3ORdXC; 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="XC3ORdXC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4261DC2BCB8; Fri, 15 May 2026 07:37:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778830664; bh=d8Z0bp5KrVQDBZfs7+Ma0qPzGEkqHB+mvK+QWSgRmfc=; h=Subject:To:Cc:From:Date:From; b=XC3ORdXCoTPkDbqEQG9e1KWmL5Zg1kSGeMbQYBKOuN7rem0HLUeNPcM4pomj1r7A4 gnxEP3Gbkbtyu695tA7ScMbbBpn1F5IR2XuSz+ba9qbCGlb/mZ6RuZJngFG4Q/GdDC FXiIxu78iKJcUvA1MYvddXYLiqV5XyJUja+WbbqY= Subject: FAILED: patch "[PATCH] spi: mxs: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,jg1.han@samsung.com Cc: From: Date: Fri, 15 May 2026 09:37:40 +0200 Message-ID: <2026051540-overlying-striving-3883@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 8b0d0011af20fb547aa67a1cefbf320992fd5e92 # git commit -s git send-email --to '' --in-reply-to '2026051540-overlying-striving-3883@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8b0d0011af20fb547aa67a1cefbf320992fd5e92 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:33 +0200 Subject: [PATCH] spi: mxs: fix controller deregistration Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 33e195acf268 ("spi: mxs: use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.13 Cc: Jingoo Han Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-4-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index b3301c69e2de..0164e04d59a1 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -619,7 +619,7 @@ static int mxs_spi_probe(struct platform_device *pdev) if (ret) goto out_pm_runtime_put; - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(&pdev->dev, "Cannot register SPI host, %d\n", ret); goto out_pm_runtime_put; @@ -650,11 +650,17 @@ static void mxs_spi_remove(struct platform_device *pdev) spi = spi_controller_get_devdata(host); ssp = &spi->ssp; + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) mxs_spi_runtime_suspend(&pdev->dev); dma_release_channel(ssp->dmach); + + spi_controller_put(host); } static struct platform_driver mxs_spi_driver = {