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 AE66F3033FC for ; Fri, 15 May 2026 05:28:21 +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=1778822901; cv=none; b=Uuj0BL2IX2cAyzmQR8VUyrPv0M/1zaOVuD2UIy/2agqJ9ejLvLHfnWRgFGnElgbfASlz7xPpcSga5oomcyGT4Wf6xi7PIGaXb/l803RM/+z4n0ZFlCo5XtNFFf6BV88925HHUl4sifCFatwfx5lzWIGhO+2qL4Bjdlh65hc1k2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778822901; c=relaxed/simple; bh=DpalC5gHzR9l2gsZSZyEqjeOXDlKwk2VdR57fgVkHZU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Do0tzQcLWMeRO+8EwirCRrCD8psJr6sWBfPbXYNayJHpQBqNczJkLonKBB2I4WyeuT0a9+1AgEE+wSLHBoXcBJXbVtDTOTs4hI9scUYjsQeWotAXVsR00RlfNz2upjB5gaOFEJ1BP3S7E6l7jFXnjc/WR3PyvSBF3rAVe2rS6Uw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CqGl7Swn; 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="CqGl7Swn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48E81C2BCB0; Fri, 15 May 2026 05:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778822901; bh=DpalC5gHzR9l2gsZSZyEqjeOXDlKwk2VdR57fgVkHZU=; h=Subject:To:Cc:From:Date:From; b=CqGl7SwniVny8m3INIsEfrkA2jVMpKvOE7K7YTjhKFE8QrAflLSjcNMs6lcJNjstd 5gapMsp7sd6/P1nqw3hD3fHNmE91zx6p9l/hAywI+GqS4pmpmoz8xyjk6w2UWBd4r4 2kH40AkwG8es66Z4OKmMCiDRkPCKk2rUVGZrUkKc= Subject: FAILED: patch "[PATCH] spi: atmel: 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:28:16 +0200 Message-ID: <2026051516-sulk-overcome-076d@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 8d4de97e83520be89d0ff40610ca633b3963a7de # git commit -s git send-email --to '' --in-reply-to '2026051516-sulk-overcome-076d@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8d4de97e83520be89d0ff40610ca633b3963a7de Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:03 +0200 Subject: [PATCH] spi: atmel: fix controller deregistration Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 754ce4f29937 ("[PATCH] SPI: atmel_spi driver") Cc: stable@vger.kernel.org # 2.6.21 Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-5-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 445d645585bf..42db85d7ff8e 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1654,7 +1654,7 @@ static int atmel_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) goto out_free_dma; @@ -1688,8 +1688,12 @@ static void atmel_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct atmel_spi *as = spi_controller_get_devdata(host); + spi_controller_get(host); + pm_runtime_get_sync(&pdev->dev); + spi_unregister_controller(host); + /* reset the hardware and block queue progress */ if (as->use_dma) { atmel_spi_stop_dma(host); @@ -1716,6 +1720,8 @@ static void atmel_spi_remove(struct platform_device *pdev) pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + + spi_controller_put(host); } static int atmel_spi_runtime_suspend(struct device *dev)