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 BAFBE3932EE for ; Fri, 15 May 2026 08:32:51 +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=1778833971; cv=none; b=JWeW6eHTo40nnPLoM38xdBUsRF1Pc3GxZMyKlA+6UvhHM33YvWc0vhAZ66UI/NX+xIQUMokuq5hObK2IyvarWrsoUELvvKi1+I1uxF4grxnPia1gauASv+xXIy6UJPrLFnPlC4/gEJbnfBbi2SLjiKB51PL6hnKzt91w38+7h1o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833971; c=relaxed/simple; bh=Y8GTW0XV0arsQteaV9w7RunP27Xtx/9/YjaMfsAl6DQ=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=eAUsQ+cbzwpE1wDdJnm+VYOAEzqPHMRImwqK1k19/n5xKaUhBlKd/Dw6mt5YdJhkfF3VapVNkFEY8/uYchS4HMEly4KvvfakQFLHagc1ac+DSb3XzSiMr4ESfAhVQzaa6g/FRiXW8C6SxN8oNh6QxeTAXJrDe9CpHbn/cLB0CQA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r24T8r4g; 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="r24T8r4g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E5A0C2BCB0; Fri, 15 May 2026 08:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833971; bh=Y8GTW0XV0arsQteaV9w7RunP27Xtx/9/YjaMfsAl6DQ=; h=Subject:To:Cc:From:Date:From; b=r24T8r4g5+27hwTiS3A8XpwBtJsMJqjKmHoNdxYpL0P1wuBs2/eS1lXDEC6GwUHwU nJ3hsgLoKIfvYMzeVTaIzhLKO6KC/1azVCgS8h0AGzqxRRbyUBwcWr8N6RgHG+SDZT bVF1jZ0UcHCckuuYoduGkhVblkJ/r3XGf24SvYsk= Subject: FAILED: patch "[PATCH] spi: cadence: fix controller deregistration" failed to apply to 6.1-stable tree To: johan@kernel.org,broonie@kernel.org,harinik@xilinx.com Cc: From: Date: Fri, 15 May 2026 10:32:55 +0200 Message-ID: <2026051555-rendering-coma-acb3@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 666fa7e9ca98e71c880086ca24147ae843f1ed6e # git commit -s git send-email --to '' --in-reply-to '2026051555-rendering-coma-acb3@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 666fa7e9ca98e71c880086ca24147ae843f1ed6e Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Tue, 14 Apr 2026 15:43:12 +0200 Subject: [PATCH] spi: cadence: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: c474b3866546 ("spi: Add driver for Cadence SPI controller") Cc: stable@vger.kernel.org # 3.16 Cc: Harini Katakam Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260414134319.978196-2-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index caa7a57e6d27..08d7dabe818d 100644 --- a/drivers/spi/spi-cadence.c +++ b/drivers/spi/spi-cadence.c @@ -777,6 +777,10 @@ static void cdns_spi_remove(struct platform_device *pdev) struct spi_controller *ctlr = platform_get_drvdata(pdev); struct cdns_spi *xspi = spi_controller_get_devdata(ctlr); + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); + cdns_spi_write(xspi, CDNS_SPI_ER, CDNS_SPI_ER_DISABLE); if (!spi_controller_is_target(ctlr)) { @@ -784,7 +788,7 @@ static void cdns_spi_remove(struct platform_device *pdev) pm_runtime_set_suspended(&pdev->dev); } - spi_unregister_controller(ctlr); + spi_controller_put(ctlr); } /**