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 7C56B402434 for ; Fri, 15 May 2026 08:30: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=1778833817; cv=none; b=Z6DNN0NIdWOr9R3x9232zBN0p9m7y2QFF3NxO9HTQ8c+7I0UPDksLV+/R3DK8egZpThf4lc4OoIjEh7KIe2Ivj9tJQT4q38fnsgEQK4b92s2q9wLG0sDoL4HwB6q15o13ooY1Dfa2JFVBhDzA5ai6F3SS6YCohGCAekp4hbzOxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833817; c=relaxed/simple; bh=uw2OOMuGojL+WGw11AcjsBxI48F62NUQEMug4vzNLkc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Wad6vzijceWBepPL+sqq1qmATEjEwvY6oHsXQlFgiEmqBczxdVsI/hbIfMHQo/Bs1cLkjuQ2Mia9EmrJFoeXevBBHepV/6Jm303Nfw4Ve99NSsIM3YhFVuS92WUClKxYJ87rbnJCh8KYXYsGPsQxyQNhM72x4INlZTKWaya/z94= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JpLP/Gdb; 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="JpLP/Gdb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D791C2BCB0; Fri, 15 May 2026 08:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833817; bh=uw2OOMuGojL+WGw11AcjsBxI48F62NUQEMug4vzNLkc=; h=Subject:To:Cc:From:Date:From; b=JpLP/GdbqQihxiqztWb64iSCklU7cNooOCf1JKVSnktGLLrcm9pOHMDNdc53hyUiJ LZET1dcOTisQa/3GJoFMnS0KYqJXHVrsmhP9YGS5fTmxR8ZO91gUcWVbfNfK8RdNlR 4BZkNvRGNHgmT3ouoi1grhTwqdS1jYXVN0As/zxI= Subject: FAILED: patch "[PATCH] spi: sh-msiof: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,geert+renesas@linux-m68k.org Cc: From: Date: Fri, 15 May 2026 10:29:55 +0200 Message-ID: <2026051555-asparagus-opium-98ab@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 45170f67a08b912ead6ccc387ba06954d1d4e53a # git commit -s git send-email --to '' --in-reply-to '2026051555-asparagus-opium-98ab@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 45170f67a08b912ead6ccc387ba06954d1d4e53a Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:43 +0200 Subject: [PATCH] spi: sh-msiof: fix controller deregistration Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 1bd6363bc0c6 ("spi: sh-msiof: Use core message handling instead of spi-bitbang") Cc: stable@vger.kernel.org # 3.15 Cc: Geert Uytterhoeven Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-14-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 7f3e08810560..f114b6313f4f 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1289,9 +1289,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) if (ret < 0) dev_warn(dev, "DMA not available, using PIO\n"); - ret = devm_spi_register_controller(dev, ctlr); + ret = spi_register_controller(ctlr); if (ret < 0) { - dev_err(dev, "devm_spi_register_controller error.\n"); + dev_err(dev, "failed to register controller\n"); goto err2; } @@ -1309,8 +1309,14 @@ static void sh_msiof_spi_remove(struct platform_device *pdev) { struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev); + spi_controller_get(p->ctlr); + + spi_unregister_controller(p->ctlr); + sh_msiof_release_dma(p); pm_runtime_disable(&pdev->dev); + + spi_controller_put(p->ctlr); } static const struct platform_device_id spi_driver_ids[] = {