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 EDC993A3E69 for ; Thu, 14 May 2026 04:59:24 +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=1778734765; cv=none; b=YzV+T5WSTMNOmUiIZc+/xB9CRTbjpc9FTFWlOtBChfEYqfp6Ks2Ic1J539L/EsJ5vCXqgLa2hCERQg2lz50moYllDARq8TlH+wALWOq/4n2eLpCRiS1geZGy3vQSf7rzFc7dyR+IiPyc3MWakUzcdwmZuA1CyQDw8cfrU1FzqUI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778734765; c=relaxed/simple; bh=N+ppzhd/FnAv0QTGg1Fey0DMowAHM9T0C9DlQII3BZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AJIzVQ7Z6o4cTfWUGe5eCk7g0gfzOMUYO82cB2BGB7b1lwxsY9281LXDzB1chUlYIOylqfMQhDlt8UsV/i9HHO1tc6ZgE9GRN4hiFl4L4TnOq6LQTQ9/CdJ3g7DDGz4Cc48mG/CPiLaPnB7aclMAuuihCcrbQLnHKBvLWyUxld4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TgFWX5iq; 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="TgFWX5iq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 443C0C2BCB7; Thu, 14 May 2026 04:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778734764; bh=N+ppzhd/FnAv0QTGg1Fey0DMowAHM9T0C9DlQII3BZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TgFWX5iqXqDGSuoy0lLeX7DjuYKZnRcDwc+TjW8/WB6WJjfDssndmvschGitafOqv xzQNJLnMvaghUiOUREOvvK1U6TVIvHVSojhqZ8pnRhkld8XkhYHUOgSs9sGe1ibEG0 GLSW8XSx0OC7rIcUYu4/0ymMqRQG9iZQ7lx6ns0F6cxJlu6bTxh9vMxq2AzKjOe0r7 Xx6Bs0/O3k3vuimtNh12MQZHX1LHDsF/6ljvSBcixXVxHbPvBfRj0Lkt2yuw5gphPa AW+jqIj0Xb/lyNCVf89Fh6+KaJmrQ6Ni6zpA2YAgx0LNKwhm6FKCBmsIQzUDH8Gviw +tBfxQLzXvR9Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Jingoo Han , Mark Brown , Sasha Levin Subject: [PATCH 6.6.y] spi: tegra114: fix controller deregistration Date: Thu, 14 May 2026 00:59:22 -0400 Message-ID: <20260514045922.25250-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051237-celestial-undone-3e61@gregkh> References: <2026051237-celestial-undone-3e61@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 [ renamed spi_controller/host API calls to spi_master/master equivalents ] 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 c99f72c9ab176..ba2c9feab1cdf 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) } master->dev.of_node = pdev->dev.of_node; - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret < 0) { dev_err(&pdev->dev, "can not register to master err %d\n", ret); goto exit_free_irq; @@ -1442,6 +1442,10 @@ static void tegra_spi_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct tegra_spi_data *tspi = spi_master_get_devdata(master); + spi_master_get(master); + + spi_unregister_master(master); + 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_master_put(master); } #ifdef CONFIG_PM_SLEEP -- 2.53.0