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 78BC63F4119 for ; Fri, 15 May 2026 07:38: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=1778830696; cv=none; b=etTXzEzTOOhNE17vnIHbjU5GDfYdbsFgvG3phlELUs4ll6DXDli4zJLiUbyTqrfzLhaFvmuPS1IfzTQCPUaK/QkMdu3YbnHdE2ZYBRTDiLxEF74MIKm0m4WoZb6T9aKoAuRTnx6hGyaUMDiHpTvTj7FG3cLuz7s3TW+buZnzYeU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778830696; c=relaxed/simple; bh=DcBzl5/pAnbUMvy9awHN58/6fdzw4fs2PfNXBX5fVlk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=VRvKCLvEIKn57S2xp9kBLrLw3xS5X66xvOHOS8k93VlLL90IE9oLHY7LRevIl/RTgHdto26ySpc+LMhuIeoX1DTAJOM164TmMZpEWM6/94OC4cyA1cuQ73fPguMUNLOoEQ7mMpZTEyRn8+Ppd1VKs8OVBLlS/Dfji9HI1Us5IK4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MS4tHb+T; 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="MS4tHb+T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBD0EC2BCB0; Fri, 15 May 2026 07:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778830696; bh=DcBzl5/pAnbUMvy9awHN58/6fdzw4fs2PfNXBX5fVlk=; h=Subject:To:Cc:From:Date:From; b=MS4tHb+TjlPYXIX+D/26laJnOcr+PZlZ/bE1iLTsy1uFYdwmHZvMcpkrKGhkzK1Ph K8vVoAUyidJCDeOaywq11v5R7MjwyWnfQnc8xHNhLGe9Mobsv939ItgM6JzP5ZBp6h gKYKDbu9zHF2Cz6c2/R6N4k8457ofjnC3AJkvMMU= Subject: FAILED: patch "[PATCH] spi: dln2: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,laurentiu.palcu@intel.com Cc: From: Date: Fri, 15 May 2026 09:38:04 +0200 Message-ID: <2026051503-daisy-condition-bac3@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 c353020fbfa8514ee91a6de2d88de4e5edca5803 # git commit -s git send-email --to '' --in-reply-to '2026051503-daisy-condition-bac3@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c353020fbfa8514ee91a6de2d88de4e5edca5803 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:10 +0200 Subject: [PATCH] spi: dln2: fix controller deregistration Make sure to deregister the controller before disabling it to allow SPI device drivers to do I/O during deregistration. Fixes: 3d8c0d749da3 ("spi: add support for DLN-2 USB-SPI adapter") Cc: stable@vger.kernel.org # 4.0 Cc: Laurentiu Palcu Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-12-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-dln2.c b/drivers/spi/spi-dln2.c index d90282960ab6..392f0d05f508 100644 --- a/drivers/spi/spi-dln2.c +++ b/drivers/spi/spi-dln2.c @@ -758,7 +758,7 @@ static int dln2_spi_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret < 0) { dev_err(&pdev->dev, "Failed to register host\n"); goto exit_register; @@ -783,10 +783,16 @@ static void dln2_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct dln2_spi *dln2 = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + pm_runtime_disable(&pdev->dev); if (dln2_spi_enable(dln2, false) < 0) dev_err(&pdev->dev, "Failed to disable SPI module\n"); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP