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 826B63914FA for ; Fri, 15 May 2026 08:30:43 +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=1778833843; cv=none; b=Zq2speHElc7t/4oA9At1tmGLMCj17KgDiyQQfkye25K1rHr6nnaTu8Kh439KNbo7xkdJSEV1pqTgbrCbY9Oo/DrxzUg6Wy8I39brrnps7u7SgWqAPgsFL+x3JmA9gBEUoSKjhxTYK2X0j9vGJ6iAoa0lra76hRrItVDEDjJISFs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833843; c=relaxed/simple; bh=IWsLX1fT9H43S0BGdc+1wltmhhYI7oWG0dxcAYTfYiU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=hKn9c5v44pXVcHv+VtQD0LyDXYf4cGG8YVK713FIvBuJrYGY1fGl3N9sqR7EeMO0aLhQoRv48Z6//x6d2CnI1deCBv+Q0zHklNeUseRlF6HstsrqI2VwrxRz+zfic9ILC25czPJR8VlZb1cgavdqjOn5XzUo5hqdVLFNsLJzvd4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=e1O4tcWi; 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="e1O4tcWi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D218FC2BCB0; Fri, 15 May 2026 08:30:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833843; bh=IWsLX1fT9H43S0BGdc+1wltmhhYI7oWG0dxcAYTfYiU=; h=Subject:To:Cc:From:Date:From; b=e1O4tcWiEGo8yrl6bwyt/zYq1ajQToIY8LLhk3g46fuidGQmiAwgdFMlHFpvBf2gf 7i6kT0ueeFmEtrowKQVIdgziLenr+qf30XAiEFAL8T4z79/nrwojinrXQ+KMJ0xW8q KffCnJKjpuz/9enVbYuHT2tmw1dJp8O0mtcTrkog= Subject: FAILED: patch "[PATCH] spi: img-spfi: fix controller deregistration" failed to apply to 5.15-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-spender-perjury-ed61@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 fc3a83b0d9c16b941c9028f5a8db9541dce4ddf2 # git commit -s git send-email --to '' --in-reply-to '2026051518-spender-perjury-ed61@gregkh' --subject-prefix 'PATCH 5.15.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