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 0CC873914FA for ; Fri, 15 May 2026 08:30:49 +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=1778833849; cv=none; b=sstr6zVMyzh35q/6IWZz9T+VYEmvtzamwese13XRuHPbLdOPh4Pq/8SBN4q/UrtInmYgTWx/On/hE3+S35sAOpMeEMKGKniLAyyoYxRhUsvAfIpUZfHjQTQ8ajgINLtQBOzIayqujix1Rxr5cSJSmWWp3I8/lFFV0z6DOUZEZv0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833849; c=relaxed/simple; bh=Rw4dwinnWRMrTzlf4l36AJN8p1KjTY78ow4jXgBGu5I=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bLCrWZw2nUrPu2V5EJ9HgwY5aaZp4Kx2UCg5XwtozExlwOfrn9n2aRN8X2eCKMX3J5DmaQ+D5LdICCzNpQwB5oDl8YY7oQT8PynR32AZPv68Fn8eSZ0ZcSH02c+9le2Hk7fUbujp9GHPtpGZDmk3brxeCnbqNH2E+cQOu+R2Tks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jg0nxcMm; 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="jg0nxcMm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EA10C2BCB0; Fri, 15 May 2026 08:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833848; bh=Rw4dwinnWRMrTzlf4l36AJN8p1KjTY78ow4jXgBGu5I=; h=Subject:To:Cc:From:Date:From; b=jg0nxcMmCbyLkdfcywD6zdgVpCBjXutz43lvMUueaATMZdfnoB3CBXx0Py3hUO46W 7ACc4ENsz/sQ0gI8Eq/XEK3NJDO/LA0beFP8OwiliUApv0UUTN+R37z5H0zoGK0A+h uVuut5CSSVsgUP3CKBsjPzmyaCzrJdpBRllpM5Eg= Subject: FAILED: patch "[PATCH] spi: img-spfi: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,abrestic@chromium.org,broonie@kernel.org Cc: From: Date: Fri, 15 May 2026 10:30:18 +0200 Message-ID: <2026051518-unsure-oyster-1ac9@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 fc3a83b0d9c16b941c9028f5a8db9541dce4ddf2 # git commit -s git send-email --to '' --in-reply-to '2026051518-unsure-oyster-1ac9@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From fc3a83b0d9c16b941c9028f5a8db9541dce4ddf2 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:14 +0200 Subject: [PATCH] spi: img-spfi: fix controller deregistration Make sure to deregister the controller before disabling and releasing underlying resources like clocks and DMA during driver unbind. Fixes: deba25800a12 ("spi: Add driver for IMG SPFI controller") Cc: stable@vger.kernel.org # 3.19 Cc: Andrew Bresticker Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-16-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index 902fb64815c9..57625a3ce2f2 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -643,7 +643,7 @@ static int img_spfi_probe(struct platform_device *pdev) pm_runtime_set_active(spfi->dev); pm_runtime_enable(spfi->dev); - ret = devm_spi_register_controller(spfi->dev, host); + ret = spi_register_controller(host); if (ret) goto disable_pm; @@ -669,6 +669,10 @@ static void img_spfi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct img_spfi *spfi = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + if (spfi->tx_ch) dma_release_channel(spfi->tx_ch); if (spfi->rx_ch) @@ -679,6 +683,8 @@ static void img_spfi_remove(struct platform_device *pdev) clk_disable_unprepare(spfi->spfi_clk); clk_disable_unprepare(spfi->sys_clk); } + + spi_controller_put(host); } #ifdef CONFIG_PM