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 0749F3C277F for ; Thu, 14 May 2026 11:45: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=1778759157; cv=none; b=A5HVXC264c8QZJdNC9lpmpca7zAbMZSLDPaSGV+xueAflNb5rNOG2/Fjv219rmKoUO1Qj/ZIjk5bCS3Zndv0GX946r3Xe+voPjNRyHSDnCHVhTbjw6866Fjuzi3F6Eoqj/YBd9YgZ1/PagHwOoK4NKVrVpI2cYPOsmThGQa5szY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778759157; c=relaxed/simple; bh=FyutX7AVrQ0iEUPBoo+wsYeRCQ4g8RZ9r58VK6NyKiA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=czmZYBo5uS/9mY1Px6Kjk50ZhePuupuTwd1fS1CM8LHnsLN/ZdZrWw9TJKaTgPn390jcrjyyTMJWRa8gKwMmu3RSZ7M2ychq5fGu9LGZ0k8J2rWCPmRxBDIWjkXJC2IqVbzp10Bdwb3JckLDnFPY4/ssMekuMiUq/oa9yz1tKO0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oyGPE2hB; 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="oyGPE2hB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BD37C2BCB8; Thu, 14 May 2026 11:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778759156; bh=FyutX7AVrQ0iEUPBoo+wsYeRCQ4g8RZ9r58VK6NyKiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oyGPE2hBBK4c9QGEhbqZCBm7G7CAeRr9Ua06bnSHElAlz6XP1XWWAzyDsO7xMgwwp avsH0tweHcX4FyUxwHXIferZI+xBoKU+0507czalu4jQHxRnCv3oicYJENoHda1+YV vVw5APjirivvhu0OkoGKkjGmkz7YeDhSNLARU0x4/0PmFXz31/3nKD2nt2NNmMaJqO t0fuIelTrcYZJSNC+l4fRb9jJld2UtSZP8cxdAL9QS4eGfK0HSFb63/2prBr0J+4qN 9mxSI70tZ3ZzfTSNslulyhUYrpSJDdMUnrygS3VQcchUjD5qyzDzH7ZbrnKH4zJF1P ho3m1QICjULQA== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Jingoo Han , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y] spi: tegra114: fix controller deregistration Date: Thu, 14 May 2026 07:45:54 -0400 Message-ID: <20260514114554.179180-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051238-manhood-earshot-9074@gregkh> References: <2026051238-manhood-earshot-9074@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 12085f4621a0c..b2c9b90fc81c1 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -1415,7 +1415,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; @@ -1441,6 +1441,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) @@ -1453,6 +1457,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