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 D71EF3093BB for ; Fri, 15 May 2026 05:32:10 +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=1778823130; cv=none; b=ekiJy5SKnlavZUHCke+8n1y8LJeKpSZWnJS0TER6Dec+bsF+Twx5iLT1Hwaclgtt4E6E1kiWDACFCP69REiftciebWpidgT5R7fcrvAvhhQcYxHfi2u/4/6dVOkH7uiRQmosDXHzTfhS7MOHVBavEc77WUbMGLvGVznXweZPxy0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778823130; c=relaxed/simple; bh=J9FHcobM6/HYjW0sZQQ9riaEb5qPLQ8a1U9pTMcaiNg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=fBCheUlIUk2xiaeBlvjDx4GJo9Rc41VdTE2S6DOrFBaitQ9ST+0z+UX8ql5Tcadlpu8BF/Xeh0G9WhVXWd78eO/AmDY0g6VaMvvu6AbbzE0AYwNxF4uThwsh9CUF/3SoP0+XY74c7GV2qageAiR3gFKZhpqd/odUwnk5NyjH8p4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=s5nyCfNs; 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="s5nyCfNs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E60DC2BCB0; Fri, 15 May 2026 05:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778823130; bh=J9FHcobM6/HYjW0sZQQ9riaEb5qPLQ8a1U9pTMcaiNg=; h=Subject:To:Cc:From:Date:From; b=s5nyCfNspKADjK6ZIsJ6Dz4Oyszh1qDwRCzYBsbnTOT6oxBpE5ySufUqAJpvkXm9R 4UjfodzT4KXjCE0wSPMhK4kgeJsPsGbNi5KA4XnvsBESNGRTX3/slIGlqQGlkjuxlj a32GVrWBqcQ0ceep1HQyaLYVC+vDr+RoRnXj5UWg= Subject: FAILED: patch "[PATCH] spi: qup: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org Cc: From: Date: Fri, 15 May 2026 07:32:05 +0200 Message-ID: <2026051505-endorphin-panoramic-48ab@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 443e3a0005a4342b218b6dbd4c6387d3c7fed85a # git commit -s git send-email --to '' --in-reply-to '2026051505-endorphin-panoramic-48ab@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 443e3a0005a4342b218b6dbd4c6387d3c7fed85a Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:39 +0200 Subject: [PATCH] spi: qup: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 64ff247a978f ("spi: Add Qualcomm QUP SPI controller support") Cc: stable@vger.kernel.org # 3.15 Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-10-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 6cbdcd060e8c..45d9b4cb75e4 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -1193,7 +1193,7 @@ static int spi_qup_probe(struct platform_device *pdev) pm_runtime_set_active(dev); pm_runtime_enable(dev); - ret = devm_spi_register_controller(dev, host); + ret = spi_register_controller(host); if (ret) goto disable_pm; @@ -1320,6 +1320,10 @@ static void spi_qup_remove(struct platform_device *pdev) struct spi_qup *controller = spi_controller_get_devdata(host); int ret; + spi_controller_get(host); + + spi_unregister_controller(host); + ret = pm_runtime_get_sync(&pdev->dev); if (ret >= 0) { @@ -1339,6 +1343,8 @@ static void spi_qup_remove(struct platform_device *pdev) pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + + spi_controller_put(host); } static const struct of_device_id spi_qup_dt_match[] = {