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 BE9BE40629A for ; Fri, 15 May 2026 08:30:08 +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=1778833808; cv=none; b=XFHcarZwPsqwGar+rcT+dMpfgNKHMJzN+Gu8brUOUxNLGy8VC3eKJSC0oe0oRMO4blCp9h7JzZfu98dXFoU1Q3ustBUxxIFZJxIRUdjbCfgMep+Tmw6aTqCZK6KlshlKP5QpQ0bGWJRbRD94fzOpHnqpPqPEeLqg1gHwDjdiyuo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833808; c=relaxed/simple; bh=Yu7eybuE6XFMIkjsnd6GVboSjyVNdGgz5zu7SexkGX8=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bWLLgFqMt6K6PKAfy3iuA7HVnpulyP1qTSBJnwx1dqmavxqrRk5wEGEfWEvPbv3OFOnl8HGoasmlv35ldSgrD9QhqLHzndMykZ1Sro8Z0SNOmFotHVoE4rhnYLMPmdhyjpJ5OK/AUXW2TrFwe3aXTosHJFC5ekIcwrynF142fTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WS2cvVq7; 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="WS2cvVq7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EF3EC2BCF5; Fri, 15 May 2026 08:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833808; bh=Yu7eybuE6XFMIkjsnd6GVboSjyVNdGgz5zu7SexkGX8=; h=Subject:To:Cc:From:Date:From; b=WS2cvVq7LqHHr+77lQfgyXGfRvHTFiGbm/W1m+VWfgWRGwAnTo6BxQuqoYRVkQ0ja CJbeIxBLC+lhgl6+5/689VvfePma4VXw/zPjqmBLFoQkxUAIbg3qLi9biCElaNpG0/ hbgs55mu42jOlcCYFjXE6hfVc6zBm1n6o7bxCfnc= Subject: FAILED: patch "[PATCH] spi: rspi: fix controller deregistration" failed to apply to 5.10-stable tree To: johan@kernel.org,broonie@kernel.org,jg1.han@samsung.com Cc: From: Date: Fri, 15 May 2026 10:29:45 +0200 Message-ID: <2026051545-squad-wharf-a0f6@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 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 9944fa6726afb1e6eb7e2212764e7da0c97f2dcc # git commit -s git send-email --to '' --in-reply-to '2026051545-squad-wharf-a0f6@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9944fa6726afb1e6eb7e2212764e7da0c97f2dcc Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:40 +0200 Subject: [PATCH] spi: rspi: fix controller deregistration Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 9e03d05eee4c ("spi: rcar: Use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.14 Cc: Jingoo Han Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-11-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index c739c1998b4c..a8180dece716 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -1171,8 +1171,14 @@ static void rspi_remove(struct platform_device *pdev) { struct rspi_data *rspi = platform_get_drvdata(pdev); + spi_controller_get(rspi->ctlr); + + spi_unregister_controller(rspi->ctlr); + rspi_release_dma(rspi->ctlr); pm_runtime_disable(&pdev->dev); + + spi_controller_put(rspi->ctlr); } static const struct spi_ops rspi_ops = { @@ -1376,9 +1382,9 @@ static int rspi_probe(struct platform_device *pdev) if (ret < 0) dev_warn(&pdev->dev, "DMA not available, using PIO\n"); - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret < 0) { - dev_err(&pdev->dev, "devm_spi_register_controller error.\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto error3; }