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 07E86371CEA for ; Thu, 14 May 2026 12:40:18 +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=1778762419; cv=none; b=pxc2udSkH12HxnJhqVWNqalJopEuXnmO2dO4cyFNsXKxIgRV/KUZFTBaFBlcow0JvBdebsk5De7gxuQL1/pWHIIYA4oBhnU274/7RQtWlGqGTfW/alMAPcKgKkb3Y+lDJJG7ykKg9+1g8aP0ZFVd0sEVDAyp1mnkB3b+eEqEJz0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778762419; c=relaxed/simple; bh=uKYVFApafaIa7ed1mIzX+o90PWdmZ15QrAfotN1GUBU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YBg4IoiLtLhNVghCAQt8rOOJGGfHtijSlFn5So+M4Rr39CpMZTEIozvob/W7kbMnaxJ2nCaKr4mVWm1P9joj6s0I5YNrRk1867wvsST3kLVniYDVOm6CAEga5t5h51YmNrOQsEuVWmTR6iMS4xoWtsQIdzBPrLX++fXHEFzPnfk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I0gpVXmm; 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="I0gpVXmm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1110DC2BCB3; Thu, 14 May 2026 12:40:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778762418; bh=uKYVFApafaIa7ed1mIzX+o90PWdmZ15QrAfotN1GUBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I0gpVXmmSMnbklgBAJ8Dy3qahCrr9+yO7pnmoLGtqxae2NA5OLlwk0IFZ+gUyu9/i /jIddNnDefTsQpBejreI8StNjIqxlO0raeXmP3ebqZO8F/fNqLSnbqOap4XkhHjvLL gOKEmx9/AdBYpmjLDrcAMAWysdUKtnh5Ouxf22xCjWYnv+NkT+Mi8g6qmCOj5Zv+yN zQ/M40rlK8P8BWXqehV/Xx+52wA5+0+In17IHQKgNsx1rpkgf9UxHF2pmn+goThKmI CCNxuXhbl2D1w3unNogOHJzYU1SHvcVFRQkylLeeBarSniGxZLNndUd8uOTqDlu7f6 xWwbdPNhQr+Pw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Jingoo Han , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: tegra20-sflash: fix controller deregistration Date: Thu, 14 May 2026 08:40:16 -0400 Message-ID: <20260514124016.210394-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051258-punctured-fox-aad5@gregkh> References: <2026051258-punctured-fox-aad5@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 ad7310e983327f939dd6c4e801eab13238992572 ] Make sure to deregister the controller before disabling underlying resources like clocks during driver unbind. Fixes: f12f7318c44a ("spi: tegra20-sflash: 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-23-johan@kernel.org Signed-off-by: Mark Brown [ renamed spi_controller/host APIs to spi_master/master equivalents and switched devm_spi_register_master to spi_register_master ] Signed-off-by: Sasha Levin --- drivers/spi/spi-tegra20-sflash.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index 62e50830b7f95..762316ec7fbf3 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -508,7 +508,7 @@ static int tegra_sflash_probe(struct platform_device *pdev) pm_runtime_put(&pdev->dev); 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_pm_disable; @@ -531,12 +531,18 @@ static int tegra_sflash_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct tegra_sflash_data *tsd = spi_master_get_devdata(master); + spi_master_get(master); + + spi_unregister_master(master); + free_irq(tsd->irq, tsd); pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) tegra_sflash_runtime_suspend(&pdev->dev); + spi_master_put(master); + return 0; } -- 2.53.0