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 CE2DD3F0A98 for ; Fri, 15 May 2026 07:39:30 +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=1778830770; cv=none; b=exfvdKDVuYrCVIt6ydVkqioFqyT2SAEVWHO+4OCu928IIwSSXbNgf1KpeS+I6cFo6za6TR2gJphwy/mUgbVFv9EduSRjW6AKE30iWWDRTy5KrTiUEhEIld2LZxDoLZRkKROlUMhJfDouczXVg4MIm2093n60fcPMLD4BMuix45A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778830770; c=relaxed/simple; bh=c/qTK5kwC8X0bhgyt9iMFfulRxtqTvyOGICW58LWmdQ=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=YijiUHN44lGcduS4XfTgoBfRREpQSae6mBHkC2pGTd6/rSNBeFQcDvhtVzvhsNZauQew7Rj1iGD9AZG27IHMAla1LXQXG2DHe6s8bB6ZrxNxDk42A0hjQBe6HGgQEbBhAExLxCgMQCiIbkDQi5EmObQ80UYyrO52zdAr5qyTmEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gQbfyywT; 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="gQbfyywT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA978C2BCB0; Fri, 15 May 2026 07:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778830770; bh=c/qTK5kwC8X0bhgyt9iMFfulRxtqTvyOGICW58LWmdQ=; h=Subject:To:Cc:From:Date:From; b=gQbfyywTPi6KbJK7Aa/Q/peh6oi/h5TsvNFMInWa33RGX+w99+x8Oc8Tar6UwOVTP 3fkPxxvOt/aioHlfE1ssC2OCrTrxbhh7go9HsYuQwVPAHk4sO+HiNhZMfn8+M19JC+ sy3lX+MG16sT0uSjegqXknDQZpzCp/tBK0eYMJ30= Subject: FAILED: patch "[PATCH] spi: omap2-mcspi: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org Cc: From: Date: Fri, 15 May 2026 09:39:25 +0200 Message-ID: <2026051524-shush-chill-9a1c@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 fb45f95c377e4a4bdece2c5e17643b459c9c13e7 # git commit -s git send-email --to '' --in-reply-to '2026051524-shush-chill-9a1c@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From fb45f95c377e4a4bdece2c5e17643b459c9c13e7 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:35 +0200 Subject: [PATCH] spi: omap2-mcspi: fix controller deregistration Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: ccdc7bf92573 ("SPI: omap2_mcspi driver") Cc: stable@vger.kernel.org # 2.6.23 Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-6-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index a3468e47e77d..56b30ff58771 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1592,7 +1592,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) if (status < 0) goto disable_pm; - status = devm_spi_register_controller(&pdev->dev, ctlr); + status = spi_register_controller(ctlr); if (status < 0) goto disable_pm; @@ -1613,11 +1613,17 @@ static void omap2_mcspi_remove(struct platform_device *pdev) struct spi_controller *ctlr = platform_get_drvdata(pdev); struct omap2_mcspi *mcspi = spi_controller_get_devdata(ctlr); + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); + omap2_mcspi_release_dma(ctlr); pm_runtime_dont_use_autosuspend(mcspi->dev); pm_runtime_put_sync(mcspi->dev); pm_runtime_disable(&pdev->dev); + + spi_controller_put(ctlr); } /* work with hotplug and coldplug */