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 7C51B3C3798 for ; Thu, 14 May 2026 11:46:29 +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=1778759189; cv=none; b=gC5YcB33wTymRO7O2SRMY9XlP+9i+JlyjrRo3jkQ6G1PpgzOabbTvXgsps9n4NIh9trSS9a8TSGhnZ6c1fiwtIiIiYfhk6dtYWWCUlivrEL0oulwfdWtHi5XGd/bYic20MdKmIns/q1qT0hmyuBOOX2NphmryewGyvtE19u+Wd0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778759189; c=relaxed/simple; bh=yXlBIbrFLn9V5sGT2sSdlijbcWdETU2RvvKz8zatE8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bgm4sSQ45PWV0HgCvkSLo3g2i2uvarptK6dmWQt2r2EX3X3iYol8boeidZBRuPKgG8dYUjf5uis2HYg4MsxWutQgBKLIix4S3AEoRw5raNOEom1nqzJk/gc9HViZuYu/EWFG0ihMyEOcUcnOZuMUUJR5nK7ZjFxvoUd/Spir2Zo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NqPZhGJy; 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="NqPZhGJy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E8E4C2BCB3; Thu, 14 May 2026 11:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778759189; bh=yXlBIbrFLn9V5sGT2sSdlijbcWdETU2RvvKz8zatE8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NqPZhGJyK30qlO6Wm3FfFQ1cVNUh7YC+9IZIuT0fZAQ4Cm/6wp2oKC3UOLJE83rMS 3P3Kpi0gSlEHTjNuB7Vnzlc5655T2jb4IVU/83kTHSISFm6dlqniBsnl6cz/CjbEze qOw4XK+3YITiZHsFLR1sUtghjb7EAEyyOkwXIWCcHl2ROWJppyEGJIbrilRiTwpRWx FQRU7m19OMhiN4vN4XQSmWCaQRjSOJ7EdeSAv+Or2RS0w65ZxItFfnUZZacyjmtngv qkhIFrA89Gpar5wFUNLzRyKAkKKlNGe1Tqafw2L1xmFsU8yCMQl11isNSOf875nQUB 2HF/KMmQ3hbug== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Jingoo Han , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y] spi: tegra20-sflash: fix controller deregistration Date: Thu, 14 May 2026 07:46:26 -0400 Message-ID: <20260514114626.180398-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051258-spearmint-chewy-6d22@gregkh> References: <2026051258-spearmint-chewy-6d22@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 d4bebb4314172..12af94a19da81 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -506,7 +506,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; @@ -529,12 +529,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