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 62DFE37C901 for ; Fri, 15 May 2026 07:39:37 +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=1778830777; cv=none; b=YTRnP+mSnwdZJM2udm/5sRCq8mASf5zCh9lxy1RPolSSEWGToTypU8iwMxss5rKTpgw1C0Uh8mo/lory3kvxHpRz/L+/seFbTyGhUudjuohZ3LE4jWV0bPsKY0quTQsRY3YXXI2TJA2TT9x5ZDOZBCetBACEXG8M9c50o4xrQM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778830777; c=relaxed/simple; bh=7ikv7SGG/Pnb3baUgN+g9Q6qiNuu8xb2fsJAQC5nieM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bDVZXTccVUYDDxtGapkMkdZHXGfXJmg6yfchClvZzwxLEk4VN/X9oYO39dao6PMNu/d9Ynlk1PxmzbaxWnYcD6XSSg4yQtYnAFGVMBRxQOlh0eOe3+4+FySMGo9kIGQIPeHu03HcpHsa83mrDfbz1k9DI4Xb3dd3T54d5fw8T6I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zNWvbrmy; 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="zNWvbrmy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B30BC2BCB0; Fri, 15 May 2026 07:39:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778830776; bh=7ikv7SGG/Pnb3baUgN+g9Q6qiNuu8xb2fsJAQC5nieM=; h=Subject:To:Cc:From:Date:From; b=zNWvbrmyY1l8vClhkG10erZWzEWVWxrlG64qY2lBW5IDW1OUt4qfTgkhMYTbMN6q9 fdEM5nlgn3wGRIwX21h2WQht8YRpi6FuPP7WgtVISfMuTjXy06iRdlnjWeF4s/7WXK gCnkoUB1TTwPN+SQcki6BlzENBgZgtZddvNp09B0= Subject: FAILED: patch "[PATCH] spi: pic32: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,purna.mandal@microchip.com Cc: From: Date: Fri, 15 May 2026 09:39:35 +0200 Message-ID: <2026051535-relight-glaring-e6e5@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 6b627bfe0c44e064aba464839e430dc1ca2b0bb8 # git commit -s git send-email --to '' --in-reply-to '2026051535-relight-glaring-e6e5@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6b627bfe0c44e064aba464839e430dc1ca2b0bb8 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Apr 2026 10:17:36 +0200 Subject: [PATCH] spi: pic32: fix controller deregistration Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Fixes: 1bcb9f8ceb67 ("spi: spi-pic32: Add PIC32 SPI master driver") Cc: stable@vger.kernel.org # 4.7 Cc: Purna Chandra Mandal Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-7-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c index 369850d14313..70427e529945 100644 --- a/drivers/spi/spi-pic32.c +++ b/drivers/spi/spi-pic32.c @@ -821,7 +821,7 @@ static int pic32_spi_probe(struct platform_device *pdev) } /* register host */ - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) { dev_err(&host->dev, "failed registering spi host\n"); goto err_bailout; @@ -840,11 +840,16 @@ static int pic32_spi_probe(struct platform_device *pdev) static void pic32_spi_remove(struct platform_device *pdev) { - struct pic32_spi *pic32s; + struct pic32_spi *pic32s = platform_get_drvdata(pdev); + + spi_controller_get(pic32s->host); + + spi_unregister_controller(pic32s->host); - pic32s = platform_get_drvdata(pdev); pic32_spi_disable(pic32s); pic32_spi_dma_unprep(pic32s); + + spi_controller_put(pic32s->host); } static const struct of_device_id pic32_spi_of_match[] = {