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 91E673911B6 for ; Tue, 12 May 2026 12:50:06 +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=1778590206; cv=none; b=KjcpLyJuRBdBgstG2+g13Klye9OpEoWudCrxHOX7HuPmEj97I/v8ajveZt7LIJUe65nGB8ts3cOKqIKQfARbLAMUFXeJmyJa8lneVd/mIHA4dUPDRPN2KrM2VSZOJCKtwZcVN8xI8Ib4HP2UxhVsc8hLrMAikjHMC9G/1XlL8+k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778590206; c=relaxed/simple; bh=oBZO24Nyp3WCPg6gX20WPbOoGkIRlm6SqAFR9VQZyRo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=EgHVDM1FYgcaZ+oRtsdmQKQ07BVibty6sBiquJbDlAHdgCyKVkHXcL14jzEzgRx4ZzxQlscTIMtogvu4c2MchvnGnPCuExXKkt0pI8ddRSvy+l3JiS54wP2PdTrsS56XY7RobBHBi7wnZ6BcUM4+xnYuHtBVPGwHXv2qvgyhhDI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lcB3TNdO; 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="lcB3TNdO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 874C2C2BCB0; Tue, 12 May 2026 12:50:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778590206; bh=oBZO24Nyp3WCPg6gX20WPbOoGkIRlm6SqAFR9VQZyRo=; h=Subject:To:Cc:From:Date:From; b=lcB3TNdOCY8nxCyOaJVqA0NciHBS1/av7JbXUAFmtUqb6ZNQgexiPaJXP+Xk7BcTY vEV1X9Uv8PHDD9ugbPsZN1YLi+Tic1pHvsLUBuiELH9g2a6/cHC7fKDwMKT8jguOdN jyZEOQnnz+Z6Gjq+B8hDEvV064RJb288Fb+eIAcM= Subject: FAILED: patch "[PATCH] spi: uniphier: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,hayashibara.keiji@socionext.com Cc: From: Date: Tue, 12 May 2026 14:47:13 +0200 Message-ID: <2026051213-unsaved-bagpipe-b075@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 0245435f777264ac45945ed2f325dd095a41d1af # git commit -s git send-email --to '' --in-reply-to '2026051213-unsaved-bagpipe-b075@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 0245435f777264ac45945ed2f325dd095a41d1af Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:54 +0200 Subject: [PATCH] spi: uniphier: fix controller deregistration Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Note that clocks were also disabled before the recent commit fdca270f8f87 ("spi: uniphier: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC") Cc: stable@vger.kernel.org # 4.19 Cc: Keiji Hayashibara Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-25-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 1b815ee2ed1b..eac6c3e8908b 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -746,7 +746,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) host->max_dma_len = min(dma_tx_burst, dma_rx_burst); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) goto out_release_dma; @@ -771,10 +771,16 @@ static void uniphier_spi_remove(struct platform_device *pdev) { struct spi_controller *host = platform_get_drvdata(pdev); + spi_controller_get(host); + + spi_unregister_controller(host); + if (host->dma_tx) dma_release_channel(host->dma_tx); if (host->dma_rx) dma_release_channel(host->dma_rx); + + spi_controller_put(host); } static const struct of_device_id uniphier_spi_match[] = {