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 4A09C3932EE for ; Fri, 15 May 2026 08:31:06 +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=1778833866; cv=none; b=P8aCOmEjWl4K60vl5C5AwwcGze5UCIaylLyt7ONqE8OInplXHl4WO0vU+6WHPm7m+mH5ooHm1WC07+ZqDnjBmyG+PGhvVO+WDnOfvUyMJ3N/tOZZre4SHE8/+43OXc4p/plRZwZfVrMR2aIQyB/t8NkYFJHxleJRmwAHPNblErM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778833866; c=relaxed/simple; bh=qnRjFXRkSeWw9zgJFkt74ZJNsb1W3+SJEpue+j+SUmk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=CS4KMrZFX4ocC/OCcwRzRcoKxKgKIobFY/nHrIMPvvxokPHsIq94kp4w/wDA0RnlurryBTWcAJ8UBktkBN6BEAMb2zQLre2wmim0lAHaorGThQUwjpWkuHGBEoPT/lRpPJeYkNcXZEko6dOLiC2IslKC2ZdB6gyK0eRKSjnScEA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bMQxuehG; 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="bMQxuehG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD3E6C2BCB0; Fri, 15 May 2026 08:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778833866; bh=qnRjFXRkSeWw9zgJFkt74ZJNsb1W3+SJEpue+j+SUmk=; h=Subject:To:Cc:From:Date:From; b=bMQxuehGMwOryiWFOvcT1rR+UTwO4q5rKt+jg81Cxob1PUcszj8R2sns9tJsht2lc LbrTnoAfXvcgG33P4HqQCeKLl22PfbMgnznIsZ8c5XasP3PIB4wYITGR9RRCZHOT+o v2wKYFIFww4bwKPdbY6ttk4AUHYGftOxYBf6dUsk= Subject: FAILED: patch "[PATCH] spi: octeon: fix controller deregistration" failed to apply to 6.18-stable tree To: johan@kernel.org,broonie@kernel.org,jg1.han@samsung.com Cc: From: Date: Fri, 15 May 2026 10:30:36 +0200 Message-ID: <2026051536-onset-output-c848@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.18-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.18.y git checkout FETCH_HEAD git cherry-pick -x 3c49a4d8799bee423a80f392ba95b26af8e9ab91 # git commit -s git send-email --to '' --in-reply-to '2026051536-onset-output-c848@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3c49a4d8799bee423a80f392ba95b26af8e9ab91 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 9 Apr 2026 14:04:07 +0200 Subject: [PATCH] spi: octeon: fix controller deregistration Make sure to deregister the controller before disabling it to avoid hanging or leaking resources associated with the queue when the queue is non-empty. Fixes: 22ad2d8df77d ("spi: octeon: use devm_spi_register_master()") Cc: stable@vger.kernel.org # 3.13 Cc: Jingoo Han Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260409120419.388546-9-johan@kernel.org Signed-off-by: Mark Brown diff --git a/drivers/spi/spi-cavium-octeon.c b/drivers/spi/spi-cavium-octeon.c index 155085a053a1..b95bfa6a3013 100644 --- a/drivers/spi/spi-cavium-octeon.c +++ b/drivers/spi/spi-cavium-octeon.c @@ -54,7 +54,7 @@ static int octeon_spi_probe(struct platform_device *pdev) host->bits_per_word_mask = SPI_BPW_MASK(8); host->max_speed_hz = OCTEON_SPI_MAX_CLOCK_HZ; - err = devm_spi_register_controller(&pdev->dev, host); + err = spi_register_controller(host); if (err) { dev_err(&pdev->dev, "register host failed: %d\n", err); goto fail; @@ -73,8 +73,14 @@ static void octeon_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct octeon_spi *p = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + /* Clear the CSENA* and put everything in a known state. */ writeq(0, p->register_base + OCTEON_SPI_CFG(p)); + + spi_controller_put(host); } static const struct of_device_id octeon_spi_match[] = {