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 579AE3F4132 for ; Fri, 15 May 2026 05:33:14 +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=1778823194; cv=none; b=XFbdirh8r0gVlTVedMRW8HAuyFFqcGzST48vht6fdC6FmPRoqoHFK0u/pv7dl8uNLcBpjL95Hcb4CfP1vX0w0dNO5A94waaZAECV+ou0hGR8sSkQY4PZOZlD5kR9uXlCOVfwAP0Xc74s9Uycw05MAPt6wWAxFo7t29lrpKof5As= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778823194; c=relaxed/simple; bh=b0rpuh5JpTLV8/czZ3QxoUR24Wwq2X/1GzeorlrtP2c=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ikBVJS4Q3Z7GeXTdlzGTxiCq4nVQJD1XqquGWmbe5ywq23FCUZZ9tZ3Gnzglj34AFWt+wXCboDe0DpIUQfznAKTJ6LhgIYU0cRzgTIOQM9kIvMyw4Ccmn054txQznXl6V5rSifKMB6VJ0BCnI3YiRhSU9qsSwkwv5gsAYZfFk7s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RX7fnZld; 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="RX7fnZld" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7314C2BCB0; Fri, 15 May 2026 05:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778823194; bh=b0rpuh5JpTLV8/czZ3QxoUR24Wwq2X/1GzeorlrtP2c=; h=Subject:To:Cc:From:Date:From; b=RX7fnZldZ4n6U0EWw1sNP9IZoKDbg+xubOIVIvsbyhKQx4rI0YK9F3U0MdPRlZgtA 3bGSxkEAGCA8+qfvoac4eg8Q9YGO/Is2UJIl4oczBUw0/6GQXOMdxtDTj0FZDwF8W9 J3ilorQwVB9sH12qc/GPOpLx3eb+GhMVgHPkN8AE= Subject: FAILED: patch "[PATCH] spi: aspeed-smc: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,clg@kaod.org Cc: From: Date: Fri, 15 May 2026 07:33:05 +0200 Message-ID: <2026051505-confess-amiable-7886@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=UTF-8 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 1044e5a4ccd57bf5a64f90100a321b498e0267a2 # git commit -s git send-email --to '' --in-reply-to '2026051505-confess-amiable-7886@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 1044e5a4ccd57bf5a64f90100a321b498e0267a2 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:01 +0200 Subject: [PATCH] spi: aspeed-smc: fix controller deregistration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure to deregister the controller before disabling it to allow SPI device drivers to do I/O during deregistration. Fixes: e3228ed92893 ("spi: spi-mem: Convert Aspeed SMC driver to spi-mem") Cc: stable@vger.kernel.org # 5.19 Cc: Cédric Le Goater Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-3-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 9c286e534bf0..c21323e07d3c 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -972,7 +972,7 @@ static int aspeed_spi_probe(struct platform_device *pdev) return -ENOMEM; aspi = spi_controller_get_devdata(ctlr); - platform_set_drvdata(pdev, aspi); + platform_set_drvdata(pdev, ctlr); aspi->data = data; aspi->dev = dev; @@ -1021,7 +1021,7 @@ static int aspeed_spi_probe(struct platform_device *pdev) return ret; } - ret = devm_spi_register_controller(dev, ctlr); + ret = spi_register_controller(ctlr); if (ret) dev_err(&pdev->dev, "spi_register_controller failed\n"); @@ -1030,7 +1030,10 @@ static int aspeed_spi_probe(struct platform_device *pdev) static void aspeed_spi_remove(struct platform_device *pdev) { - struct aspeed_spi *aspi = platform_get_drvdata(pdev); + struct spi_controller *ctlr = platform_get_drvdata(pdev); + struct aspeed_spi *aspi = spi_controller_get_devdata(ctlr); + + spi_unregister_controller(ctlr); aspeed_spi_enable(aspi, false); }