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 4165537C901 for ; Fri, 15 May 2026 07:39:15 +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=1778830756; cv=none; b=pxHV/k+1XJGvm2OsBI2nH7FJx9ST7m/VAlIlb/d2ZiQW9Jy4jsxl+NxHByWjCo8/vQtYT5y8s8YNyNXnum+amvtDyVUlNWvoWhDUD26BZCm4iUvomjvqGvGaUKRfs+IAfxAgm+g0W4P9RXtwZxxZ7x6+tOjKwf5Z+3ea23QFIsU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778830756; c=relaxed/simple; bh=q7SyW2KtYzrGFyiB5ZCXqaUvW2zKIJNXWiH25vng93Q=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=BctkIbtAkHN3c9njStSotUdehyyo5+BZabFJP8Vs9L6EnbvRgOxmhtPiPcAcYDLO0Ra0GcwsJGGU8/Z89rFxyfuaMD9bgyWrPdp+yom64kdV6h4fV6WPYtBPyDwN007BYdpl6D4b9iF/8S3KiZnuHiQonYPgZYcfAMmZW3b75BQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BZmY1o+E; 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="BZmY1o+E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84B77C2BCB0; Fri, 15 May 2026 07:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778830755; bh=q7SyW2KtYzrGFyiB5ZCXqaUvW2zKIJNXWiH25vng93Q=; h=Subject:To:Cc:From:Date:From; b=BZmY1o+EnFbulrV9CbYuTNRxpKiXQk9RnYgE7Ka/VggawoSjSTi6yq8IkfWRyEPc8 KsgY9+YsE45LiEGZ1T2Y9LqN2z4O7pu/FQhvCwkiqqpuTgtJGQ+91TAhV7dEWS4G3D 4Zn9hEGmf08fzgso0hKQHsUCv9t0KueYK2alGHjQ= Subject: FAILED: patch "[PATCH] spi: fsl-espi: fix controller deregistration" failed to apply to 5.10-stable tree To: johan@kernel.org,broonie@kernel.org,hkallweit1@gmail.com Cc: From: Date: Fri, 15 May 2026 09:39:12 +0200 Message-ID: <2026051512-amulet-awoke-0b25@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.10-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.10.y git checkout FETCH_HEAD git cherry-pick -x e506a700a7ad229f5c8f01f4b8350119cccb4158 # git commit -s git send-email --to '' --in-reply-to '2026051512-amulet-awoke-0b25@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e506a700a7ad229f5c8f01f4b8350119cccb4158 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:12 +0200 Subject: [PATCH] spi: fsl-espi: fix controller deregistration Make sure to deregister the controller before disabling runtime PM (which can leave the controller disabled) to allow SPI device drivers to do I/O during deregistration. Fixes: e9abb4db8d10 ("spi: fsl-espi: add runtime PM") Cc: stable@vger.kernel.org # 4.3 Cc: Heiner Kallweit Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-14-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 56270f8fdc17..45b9974ae911 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -718,7 +718,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, pm_runtime_enable(dev); pm_runtime_get_sync(dev); - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret < 0) goto err_pm; @@ -782,7 +782,15 @@ static int of_fsl_espi_probe(struct platform_device *ofdev) static void of_fsl_espi_remove(struct platform_device *dev) { + struct spi_controller *host = platform_get_drvdata(dev); + + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&dev->dev); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP