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 D5B2C3AA4E9; Fri, 10 Apr 2026 08:18:56 +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=1775809136; cv=none; b=fkd3953ejPpOqPFRWdfq22Ek1qB6KAU1PKinup7zRVTqfXuw9hAcqJT0agcUOWKBQJ/28TGjudDoQ6IS1K+uovp0SrQ63NY5W9g5GDuUw1rFVYSWg1r3vM8wPyl58tLclvRVjRXU+wlbOrQyZBdDOHrMzeAsgHiY+WqJi/UZE/Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775809136; c=relaxed/simple; bh=SXm/RBHe515zxULaI16EssAA0uuL015l7Kor1U9rZUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H1f4jjoEuV46HPVx/kHdm8eV2+Kw83ExIGHT42loWpCgduuL1evJIBhfsGa5jU+gzdHSkWH+8VkMgdYwuUFmVVAScn0czMsI8hMdy+zYoQs3t5v80oZlUEigTMz3OUQjxuM67RbiFBdv/SjtSZK6jaFBgCEanRykvX7FKItAaa8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GwDgWTQ1; 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="GwDgWTQ1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 725C1C2BCAF; Fri, 10 Apr 2026 08:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775809136; bh=SXm/RBHe515zxULaI16EssAA0uuL015l7Kor1U9rZUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GwDgWTQ1+1TTPwoeIIZDGKZR18hrAaL0snvxNPYeon9gRiVh52V4X6F2S/wNP7y/u 55ZfZ2wAKr+y8FAG7JKMsZPFuS9DD+NzWJ+DIiLfwzKADQlV6+wMLM8UQGVBFJUsha eptdNHMR3oFQK1i5+yVifcr1fqAZpMuFapXLIVpltkdw0mjCzsRo5Wk5FsRxPb31z7 1FnCIB8kqlpGRFb7gygxNcXkxecS8SuKjs5QlfKGhth+UJiCGZLGREkkDcL//o88mO btQiyv4yzNY4o/zaOGIA7vkf+gErPjYRwyve9qp+VHaRIQ6AdUA+jtJvWoXcuDqTB4 4cAy5imywt79w== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wB74n-000000026uO-3aME; Fri, 10 Apr 2026 10:18:53 +0200 From: Johan Hovold To: Mark Brown Cc: Matthias Brugger , AngeloGioacchino Del Regno , Frank Li , Sascha Hauer , Andrew Jeffery , Avi Fishman , Tomer Maimon , Tali Perry , Linus Walleij , Andi Shyti , Tudor Ambarus , Paul Walmsley , Samuel Holland , Orson Zhai , Baolin Wang , Jernej Skrabec , Masahisa Kojima , Jassi Brar , Laxman Dewangan , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 04/26] spi: npcm-pspi: fix controller deregistration Date: Fri, 10 Apr 2026 10:17:34 +0200 Message-ID: <20260410081757.503099-5-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260410081757.503099-1-johan@kernel.org> References: <20260410081757.503099-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 underlying resources like clocks during driver unbind. Fixes: 2a22f1b30cee ("spi: npcm: add NPCM PSPI controller driver") Cc: stable@vger.kernel.org # 5.0 Cc: Tomer Maimon Signed-off-by: Johan Hovold --- drivers/spi/spi-npcm-pspi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-npcm-pspi.c b/drivers/spi/spi-npcm-pspi.c index e60b3cc398ec..cffef0a5977d 100644 --- a/drivers/spi/spi-npcm-pspi.c +++ b/drivers/spi/spi-npcm-pspi.c @@ -413,7 +413,7 @@ static int npcm_pspi_probe(struct platform_device *pdev) /* set to default clock rate */ npcm_pspi_set_baudrate(priv, NPCM_PSPI_DEFAULT_CLK); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) goto out_disable_clk; @@ -434,8 +434,14 @@ static void npcm_pspi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct npcm_pspi *priv = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + npcm_pspi_reset_hw(priv); clk_disable_unprepare(priv->clk); + + spi_controller_put(host); } static const struct of_device_id npcm_pspi_match[] = { -- 2.52.0