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 D72613AA1AE for ; Fri, 15 May 2026 08:31:17 +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=1778833877; cv=none; b=lTEeRA4WEJ3bHS4GrwN55vBxD7B4nUyY26ckzjSG941hs8rUBG6lUGBqRvWcFhgJjOYl/8eqZya+wnUXp5D8cYTMmLzHJX1/QsfNSmldgWPCGM+Hmtd+pDGdEUa5h9PtBKJ3XccgF7sm/Q3pGQkBdS4c4zlwqTjN4vk6QYRmcFU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833877; c=relaxed/simple; bh=Y3iYOTz2kyYnF7SQDzYl/rZRwWjc7vDukQXYN5eZCeA=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Stsix0lmLDrcdrTewnpOtlYHkzPT6v5ruq0TyCtnBwTC/c/7vBsQomKPAJhqVBJu9x4HExDd4dOdo4ci2YBUAinZBEFBmLiqcPOTRoMS6mtOTjLsFNDAK3c5EW73+TE4sYxXzak4wHjoVIRHm/kncgZLyHFuZxM7Nfhzfl2lf4c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LcI81vqv; 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="LcI81vqv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63E33C2BCB0; Fri, 15 May 2026 08:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833877; bh=Y3iYOTz2kyYnF7SQDzYl/rZRwWjc7vDukQXYN5eZCeA=; h=Subject:To:Cc:From:Date:From; b=LcI81vqvUfMYRt3a4YWm1fWH2CZ0FYoogMZOIxX7vpnv325Dm39AiwbFA9yjnfEVO 5nnRROrFtYNJ6h1DtS28sRfIKRjxj/AFAddSSAHIG2r9Goss5FRWoWfaVsiyb7QFMZ VE07N77aJMUjybGxLEnd8eLqD/LsnkOnMgmgKPAU= Subject: FAILED: patch "[PATCH] spi: mxic: fix controller deregistration" failed to apply to 6.6-stable tree To: johan@kernel.org,broonie@kernel.org,masonccyang@mxic.com.tw Cc: From: Date: Fri, 15 May 2026 10:31:08 +0200 Message-ID: <2026051508-showman-chili-659f@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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x adbc595e272052181d40ec307a4c5ba98571b0fe # git commit -s git send-email --to '' --in-reply-to '2026051508-showman-chili-659f@gregkh' --subject-prefix 'PATCH 6.6.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[] = {