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 B8C97371CEA for ; Thu, 14 May 2026 12:40:33 +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=1778762433; cv=none; b=KciRI54i1YViMxZm1N8mS9Yl1N9yt8ZMgRAkjhkvoLd9dAPK0SPmMdS7/5pCAoWlQTGApujHVeO74pY7ocKwJ3Bix5IlfXEPMZVojTxSC2f8SDvQlWOJWo4IYg5D6nokYiTcjXjmiiMdBx4xLmf8ixKMt99Johm3a6038lBuaxY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778762433; c=relaxed/simple; bh=WCo9H+JZtXid+0AI0F+x2KqwZhxIEfKmghy0oqIASfU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L8zSLAJ0frxZ9EkpTdDUU/0q7BOiJnJ1CkIONgA1hPfAxG04u/N+X4TVbPgzol7Z6cMRBbBDJhL6cscTEbQUVB8c7RHP60CIJFSKMo2iD6kxKLkzU/qmpmvkVnfWYP4bH5cU8OxkOQLHz0jrcxwUlt1bAvALdqMq0QmL7r7xxZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tqDKdmY8; 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="tqDKdmY8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87019C2BCB3; Thu, 14 May 2026 12:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778762433; bh=WCo9H+JZtXid+0AI0F+x2KqwZhxIEfKmghy0oqIASfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tqDKdmY86tgL6BepVt/5NGyDLJlTxu2ZDahohx5VMR3QCSM1K5zxSy6sTZhsExOd8 FEh/zmb/niPENw82YTmQ21uVdv3xJUKRS9yZ4fc5TB+BOk8Pgwk8PsXTv1oi4y2yJe zsPMazuZWMVw/sg9jaN1c6CPr4uF2uhU4WVcGsJUlkNiL0Z3iGc4lF0CgQ3aCFgXlg 2+WDXEVoW+n0azeI6+V36BWv+x45/x/cKQFPpfzFROyl62W/ddnIrp8OZPcyDPnzy4 dL5LtS6T6O0uCNEGm4FOojpQtIlrqH7RKdQiPrv0zGK93PS3mIea3AnhUbzd3C2Z/5 EfYktaCfgu7Pg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Jingoo Han , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: tegra114: fix controller deregistration Date: Thu, 14 May 2026 08:40:30 -0400 Message-ID: <20260514124030.210588-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051238-satisfy-stooge-2f63@gregkh> References: <2026051238-satisfy-stooge-2f63@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 APIs to spi_master/master equivalents and placed spi_master_put() before the existing return 0 in remove ] 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 ed42665b12241..d68babc5f3b85 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -1422,7 +1422,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; @@ -1448,6 +1448,10 @@ static int 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) @@ -1460,6 +1464,8 @@ static int tegra_spi_remove(struct platform_device *pdev) if (!pm_runtime_status_suspended(&pdev->dev)) tegra_spi_runtime_suspend(&pdev->dev); + spi_master_put(master); + return 0; } -- 2.53.0