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 E869A3C276B; Thu, 9 Apr 2026 12:05:26 +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=1775736327; cv=none; b=kEJMxZkgg+3xJaQvURgK7UyYx+x0m4ZTIuSh/X/LHXDFKMcVq2Z9OdR9R1fb6NeFf3WYSAjVBrHMP75faAD0cGX1cwSRC7jDFAobxz9xSYGW+5cgarVYxhK+cQIoOagpGBOBq5gY20EaNmaY847/OTgS60Ln/Ayq499J5LITra8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736327; c=relaxed/simple; bh=wuZDVHmIHpg4emeVoxEEiPHCm40raWJLH8pnoqP/UOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fq1StYSTPKidwTMdI23C21u8yj+e2Iknm9cessSUD+EBtw7JhBNWM6p2vqynsU0X1we24QjLtoah4Uq73SWsFNpx6wY07SlQ+8I4KuyXA8uIBGF5fEKMoQWNwmYZPaPpDQsDYk0FUmv0AT0vZOMzZ1JpjKyMSwoOHXU/K+kX9gE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T8v0G51I; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="T8v0G51I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D041C4AF0D; Thu, 9 Apr 2026 12:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775736326; bh=wuZDVHmIHpg4emeVoxEEiPHCm40raWJLH8pnoqP/UOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T8v0G51I+vDqXHFH+4ezmkSOD/xS+OMRnRhVguvb6Q5SdK37+C6klJl/Yq/LITzXV J/RrxJ98IScK1+p9Te8um78djbO6meKSxDtUl+88h2vDsE6b6teRRUFtKqfrYRyiOc F0W7sDHdso76fnUwssF+pLsBdQ75p9KSPMH4zAX2wgnSsWlryXBOFqQo/5rt+2XzWc zlmXowsUTpB5JTtH+GEC7PpaAyq2IDADj9/iAic9TKgmtvQ4pjR0MOv++wwugcnzC3 XMr7VN6T9k2f8b6kHoPFuZRlkTDNBAgTtoZwH2JLQXMsPzPmXdhuKe03uhh4x1Kzm3 osdaRcYSCc71w== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wAo8S-00000001d6v-084Q; Thu, 09 Apr 2026 14:05:24 +0200 From: Johan Hovold To: Mark Brown Cc: Sunny Luo , Xianwei Zhao , Chin-Ting Kuo , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Radu Pirea , William Zhang , Kursad Oney , Jonas Gorski , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Jingoo Han Subject: [PATCH 08/20] spi: octeon: fix controller deregistration Date: Thu, 9 Apr 2026 14:04:07 +0200 Message-ID: <20260409120419.388546-9-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260409120419.388546-1-johan@kernel.org> References: <20260409120419.388546-1-johan@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/spi/spi-cavium-octeon.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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[] = { -- 2.52.0