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 8126D3F4132 for ; Fri, 15 May 2026 05:32:16 +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=1778823136; cv=none; b=PiWuBCFki3qlp8/ph8XooO/9L9pNt9LmJ3li3LTF8r17W/KJ9TN9FOWmw31spca6YfJWAAV+nbWmFreOteMOlFAu4c5zJCFubmyibCXr3QbkoOAnoud0zbf96iFRbuSWD6nCIzVMsYlXTxxidO9n2CkkimHqQD+4NXxhXLF7NwM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778823136; c=relaxed/simple; bh=R2Ao7g9Zg4nN6RiLHRO5af9cVK6OebAWEqIAE5HNOpI=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=nUQozbSLFjMA+7ahsxSO643Sty7dtIMBsJVVrsNdWW5ATGjBMTGizNK9ZFzveYDO+5cx/NspRz35n7GRgKxxAtH/Wk92KDovJzfsoEBTxdDzUOlE1RR8OIaDABBAzUkFDyuWsrA+n7aqD38E2/Xhwcmpl619NOFCATlb9NXKjPs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1+zZxIb/; 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="1+zZxIb/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E09DC2BCB0; Fri, 15 May 2026 05:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778823136; bh=R2Ao7g9Zg4nN6RiLHRO5af9cVK6OebAWEqIAE5HNOpI=; h=Subject:To:Cc:From:Date:From; b=1+zZxIb/9081W7p/1+JYB0t/bbTSqql7AwttrsXGhOCM5jWDTmA50KKIYrcdyAqLa JbuNaGBx746xZjSGfAt9k0gIre/QLypq7q8ue0xiYa/0CKAhQCDfWqaGW9Wf1GMDmI I2mlzgsFPs8FkumwJXnJyWkpGrcE7fOU5gg5h8FQ= Subject: FAILED: patch "[PATCH] spi: at91-usart: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,radu.pirea@microchip.com Cc: From: Date: Fri, 15 May 2026 07:32:20 +0200 Message-ID: <2026051520-clover-nemesis-ddb7@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 9acecc9bcff058eaef40fd7a4c3650e88b06b220 # git commit -s git send-email --to '' --in-reply-to '2026051520-clover-nemesis-ddb7@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9acecc9bcff058eaef40fd7a4c3650e88b06b220 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:02 +0200 Subject: [PATCH] spi: at91-usart: fix controller deregistration Make sure to deregister the controller before disabling and releasing underlying resources like clocks and DMA during driver unbind. Fixes: e1892546ff66 ("spi: at91-usart: Add driver for at91-usart as SPI") Cc: stable@vger.kernel.org # 4.20 Cc: Radu Pirea Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-4-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c index 76eb3ba75ab1..79edc1cd13c0 100644 --- a/drivers/spi/spi-at91-usart.c +++ b/drivers/spi/spi-at91-usart.c @@ -556,7 +556,7 @@ static int at91_usart_spi_probe(struct platform_device *pdev) spin_lock_init(&aus->lock); init_completion(&aus->xfer_completion); - ret = devm_spi_register_controller(&pdev->dev, controller); + ret = spi_register_controller(controller); if (ret) goto at91_usart_fail_register_controller; @@ -634,8 +634,14 @@ static void at91_usart_spi_remove(struct platform_device *pdev) struct spi_controller *ctlr = platform_get_drvdata(pdev); struct at91_usart_spi *aus = spi_controller_get_devdata(ctlr); + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); + at91_usart_spi_release_dma(ctlr); clk_disable_unprepare(aus->clk); + + spi_controller_put(ctlr); } static const struct dev_pm_ops at91_usart_spi_pm_ops = {