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 708F23DEAC5 for ; Fri, 15 May 2026 08:31:26 +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=1778833886; cv=none; b=HSoAaYkhtlE80NTEKmRqpzyJhxWdOrhdrjN/TK8l/3CovMvbUPw64R9qhk3iPA8nWkJh2B4uRdJVa1Cnfp93PzjzZZwbgV87pECKVudhpntCHHKCR2iZtJQXRTXp8qkwAcDineeigMb/pYRrNS2Q2PTx0j86adbrwLl+iPlIHig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833886; c=relaxed/simple; bh=BsRKOYAEMhZG/5W70lNy5hG5g8drn9m+UwkqfkaBBiE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=c+8K437Y0gMqhzj00ta+kIHA7zL39os0unzEydc/Tl5ysBuQAEhN7Pams6Yr7axu99W9P1NQI3QDaStvZPzfmsyQWTINh30VlpgW81z8d967rJnYbq00TVuRC0uoQJf1lhE+Gsv/T0igM9RssLx12DZcoVf84dd3ri3pMz78FC0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EQzwaUk8; 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="EQzwaUk8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC4F8C2BCB0; Fri, 15 May 2026 08:31:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833886; bh=BsRKOYAEMhZG/5W70lNy5hG5g8drn9m+UwkqfkaBBiE=; h=Subject:To:Cc:From:Date:From; b=EQzwaUk86J4lHfQKOT5TvOIHb/Ag9J7Mx1OM6YDZ4EhgYg3FrPUlPNJoOEZJgwh3Q ZXFKhlPPo6NdeBGo2ZQG5IZrzODjqf1Y4PPQiu7kjaii28mIyeDSd726m2dR7mg/aN CgbwrpZTvxv9KNo6c47zDbvWF/+mNbiFkS6F/q3E= Subject: FAILED: patch "[PATCH] spi: mxic: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,masonccyang@mxic.com.tw Cc: From: Date: Fri, 15 May 2026 10:31:09 +0200 Message-ID: <2026051509-wildness-cube-54dc@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 adbc595e272052181d40ec307a4c5ba98571b0fe # git commit -s git send-email --to '' --in-reply-to '2026051509-wildness-cube-54dc@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From adbc595e272052181d40ec307a4c5ba98571b0fe Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Tue, 14 Apr 2026 15:43:16 +0200 Subject: [PATCH] spi: mxic: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks (via runtime pm) during driver unbind. Fixes: b942d80b0a39 ("spi: Add MXIC controller driver") Cc: stable@vger.kernel.org # 5.0: cc53711b2191 Cc: stable@vger.kernel.org # 5.0 Cc: Mason Yang Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260414134319.978196-6-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index f9369c69911c..b0e7fc828a50 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -832,9 +832,10 @@ static void mxic_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct mxic_spi *mxic = spi_controller_get_devdata(host); + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); mxic_spi_mem_ecc_remove(mxic); - spi_unregister_controller(host); } static const struct of_device_id mxic_spi_of_ids[] = {