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 E1C562D739C for ; Thu, 14 May 2026 03:10:39 +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=1778728240; cv=none; b=Yc8HOZgutj1xMBBRO9a+n0AGMBY4HvV4GCBXGrGj/cbYFwwho2Ri0ESAnXJn+5vAk8c4BYWzdrzkVLSpVZo2Cr69qCWrhNLa0PGDrBQzj6PDQMaCIXW6PFQivpok2RUSmoLM/PNrp+USqhkRky4d28YpplDB2esxr27y9YRQQMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778728240; c=relaxed/simple; bh=/0A1PaDhq5apXTHRHJC3p/ZlxkRDfUtVxVZ9qD5XZ3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cWHKaxSNE4e/dxc/8dq+/BKKb985cjb1yCIR37rqF0+x6h2v3VRNYpjmt5BicHB8FHYHOQhifVGRopUxDHuezxuwbe4XTnSIeOLLjC/abQjH3ch20dq+cwPMMuQIqED17s42zL004jSzNw7G+OnQMfjug8LCQNKQCJ2XB9l57yc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FTm7FU2n; 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="FTm7FU2n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35DAEC19425; Thu, 14 May 2026 03:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778728239; bh=/0A1PaDhq5apXTHRHJC3p/ZlxkRDfUtVxVZ9qD5XZ3Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FTm7FU2nNQ8amRC4F8mjIf5mYE6yrnUqMq0i1btiu4dJnQj+yoRVk6ie8yjldfZPO 5wUPzMzTSQqDkHbbcOWiUYeZUCdurn4TD9soON933+aEoWMyqwCqRiTVIt6i5HFXtq tkYrS7P3Bpw3EldgrN85zRCxsJ50Q/5ta2pWdrTn7WcbPDF8TPqCX+k6zLkRhwLoEk OGrQSw9J0jocEx525x4gF3bVbroPnDrgsBotY2eAbTwIBrznZMeotBv6UC1bBIoKE0 rTHm/axt7OPlexd10Y1z8XRey5nsTORKADVZdK0O3PJH9/und34rBHBcS2FPKNbnWO QI4oE8w/syNTA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Jingoo Han , Mark Brown , Sasha Levin Subject: [PATCH 6.18.y] spi: tegra114: fix controller deregistration Date: Wed, 13 May 2026 23:10:37 -0400 Message-ID: <20260514031037.4119194-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051237-disband-manual-6d4e@gregkh> References: <2026051237-disband-manual-6d4e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 9c9c27ff2058142d8f800de3186d6864184958de ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: 5c8096439600 ("spi: tegra114: 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/20260410081757.503099-22-johan@kernel.org Signed-off-by: Mark Brown [ kept `host->dev.of_node = pdev->dev.of_node;` context line above the `spi_register_controller()` conversion ] Signed-off-by: Sasha Levin --- drivers/spi/spi-tegra114.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index 48fb11fea55f2..a28597b6b80d6 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -1416,7 +1416,7 @@ static int tegra_spi_probe(struct platform_device *pdev) } host->dev.of_node = pdev->dev.of_node; - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret < 0) { dev_err(&pdev->dev, "can not register to host err %d\n", ret); goto exit_free_irq; @@ -1442,6 +1442,10 @@ static void tegra_spi_remove(struct platform_device *pdev) struct spi_controller *host = platform_get_drvdata(pdev); struct tegra_spi_data *tspi = spi_controller_get_devdata(host); + spi_controller_get(host); + + spi_unregister_controller(host); + free_irq(tspi->irq, tspi); if (tspi->tx_dma_chan) @@ -1453,6 +1457,8 @@ static void tegra_spi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) tegra_spi_runtime_suspend(&pdev->dev); + + spi_controller_put(host); } #ifdef CONFIG_PM_SLEEP -- 2.53.0