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 F0D853812D9 for ; Tue, 12 May 2026 12:49:06 +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=1778590147; cv=none; b=OvpiOjYh8f9zuyT42ZJbFALlD+Rw9y0jgD7p17RLkyxY1m0xfMlYXEyaLL3z+l28SOCi8MV4Co6W/1vr8XKE5FF4lmqBB5YyVjb/qQh3WI3YXsrr4IC+n9rKyQ2YNzRkIg4ppuj7r7G0p529oMj9WC/OCpEA9+ZlwSrNSOMetUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778590147; c=relaxed/simple; bh=cgdfDyn6KZ4H6k8Iz8n2wLebazQnG0xUma1moncsQs8=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=MrdJHgq12maCT43MOhEDqCDji/qcqP3myeiLi9XFUpgYrenJYGkaoiS03JdgS4tDKdQNXhpScLzIr2pao/d4G3B1TQ/YLku6mpcMh8f/yBY2DSv8NyzsW4ng8nyKYU88naJFsDU2OB0UFF+tbG0Uap0grBu41uURQJEL60YeFf8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vUk5PmjR; 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="vUk5PmjR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7559C2BCB0; Tue, 12 May 2026 12:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778590146; bh=cgdfDyn6KZ4H6k8Iz8n2wLebazQnG0xUma1moncsQs8=; h=Subject:To:Cc:From:Date:From; b=vUk5PmjRuZHaKap0zIx+1jGxPOpTnxiFI2JVeH709YYUs4IHqmL+z71jjyXxqc0x9 trK+z+xrMJmz9JCSriXYluim5SLHZdlQ5+atIv53WMAeSL/w3d467R1ETmYywsFi3q b15BQScvpuvgmrZ79gEti3VO1JOB6YZZIGDp4lSo= Subject: FAILED: patch "[PATCH] spi: tegra20-sflash: fix controller deregistration" failed to apply to 6.18-stable tree To: johan@kernel.org,broonie@kernel.org,jg1.han@samsung.com Cc: From: Date: Tue, 12 May 2026 14:46:57 +0200 Message-ID: <2026051257-sprint-buddhist-5107@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.18-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.18.y git checkout FETCH_HEAD git cherry-pick -x ad7310e983327f939dd6c4e801eab13238992572 # git commit -s git send-email --to '' --in-reply-to '2026051257-sprint-buddhist-5107@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ad7310e983327f939dd6c4e801eab13238992572 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:52 +0200 Subject: [PATCH] spi: tegra20-sflash: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: f12f7318c44a ("spi: tegra20-sflash: 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-23-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index d9d536d7f7b6..9256729f2d49 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -505,7 +505,7 @@ static int tegra_sflash_probe(struct platform_device *pdev) tegra_sflash_writel(tsd, tsd->def_command_reg, SPI_COMMAND); pm_runtime_put(&pdev->dev); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret < 0) { dev_err(&pdev->dev, "can not register to host err %d\n", ret); goto exit_pm_disable; @@ -528,11 +528,17 @@ static void tegra_sflash_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct tegra_sflash_data *tsd = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + free_irq(tsd->irq, tsd); pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) tegra_sflash_runtime_suspend(&pdev->dev); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP