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 D35963DEAC5 for ; Fri, 15 May 2026 08:30:54 +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=1778833854; cv=none; b=urR4E0uBDn9cI/a0ui5xWd3VepoZzqF8AV9ai8nWbAth8GcNJJVEuDwZKakOBqsfrJVZLejyQgMLyF6QYGyZIpeWF93EWMpkgQLj5ovsmiuwIzAoXJQcIziuN9UcnCaiwR6xheXw5Oz8cJGubUIHmOoM4Vhps9CvpDm4+nSSEow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833854; c=relaxed/simple; bh=vWGCpuuisOnonbdZEuNu9IoAXz55o/+2VjFgtW5TuYc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=md0kMw9w+mKyzDT0glEplg/9CoRF2FkLP9uNpBphVkd9JB2A+pYcvCfSvy4Ngiq+QDPI865mq4jP779NkdjgXlAQwmvVVV8iZHNz2aWoMMun2ydKpXz/A4xvCxIepNSO2e5WshueuMDfdrsljfMKOZPcUMv5sAPoBxKMCCCTaQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1Qi6sc97; 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="1Qi6sc97" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55BE2C2BCB8; Fri, 15 May 2026 08:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833854; bh=vWGCpuuisOnonbdZEuNu9IoAXz55o/+2VjFgtW5TuYc=; h=Subject:To:Cc:From:Date:From; b=1Qi6sc97KxENO0S4trvcMEad38aLUqMbEnL2hlZt5bLEBljSOmRYgvvs9tBLOSDX4 ahb1MnAB1MCR8T1q41ZkPm/PFAzYubfddABGgzvgB4buCADk6lQ7c/XkHYBu6n6OUq JczoWX3gUxDzAU10XzegLfesFrhfB8bOKJsxuTsU= Subject: FAILED: patch "[PATCH] spi: mpfs: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,conor.dooley@microchip.com Cc: From: Date: Fri, 15 May 2026 10:30:26 +0200 Message-ID: <2026051526-expectant-iguana-5f72@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 573c7db8fce91a1b07dd64a260bb44b9e6d05943 # git commit -s git send-email --to '' --in-reply-to '2026051526-expectant-iguana-5f72@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 573c7db8fce91a1b07dd64a260bb44b9e6d05943 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:19 +0200 Subject: [PATCH] spi: mpfs: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like interrupts during driver unbind. Fixes: 9ac8d17694b6 ("spi: add support for microchip fpga spi controllers") Cc: stable@vger.kernel.org # 6.0 Cc: Conor Dooley Signed-off-by: Johan Hovold Acked-by: Conor Dooley Link: https://patch.msgid.link/20260409120419.388546-21-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-mpfs.c b/drivers/spi/spi-mpfs.c index 64d15a6188ac..989a379b0700 100644 --- a/drivers/spi/spi-mpfs.c +++ b/drivers/spi/spi-mpfs.c @@ -574,7 +574,7 @@ static int mpfs_spi_probe(struct platform_device *pdev) mpfs_spi_init(host, spi); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { mpfs_spi_disable_ints(spi); mpfs_spi_disable(spi); @@ -592,6 +592,8 @@ static void mpfs_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct mpfs_spi *spi = spi_controller_get_devdata(host); + spi_unregister_controller(host); + mpfs_spi_disable_ints(spi); mpfs_spi_disable(spi); }