From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 AEA764779B3; Tue, 16 Jun 2026 17:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632390; cv=none; b=u54tY6+O6OTcJtaYHGJKcBN1RUpROOgk3DwXv/bPRjeUpwTfJS/F+9JZ7lrRCKPXhqj0NNz5Imh7ORrA3JiyDoJB4Ryyu7Ss65dtK7cQAZiy1hX88JrOgF0MaaenndjWSdlQ28RQHv1mIt9emCaSg8Y/I7yM3KHGyEEFkFL2jb0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632390; c=relaxed/simple; bh=OcdRlbNgQnsdbyMXkF73D2JCdpLUOxZiA0iQSrHfb2E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XmqvHCggF41U7x3lBKd5fmPgobmtr6ksH1k/WCJ33PNGrTmvb3asQXNmxZxwNsVFZvhyyZEp1at3sbnN1kVJir3fswCk5L4Jw9RE3aJ1lUL0eQ6w/Hc2lpTgh5MKN60QwYgU4woJERn7S//VtSE3SoZ5zuDImlmFUhqtY4ikts8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xA/1uYhE; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xA/1uYhE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F6021F000E9; Tue, 16 Jun 2026 17:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781632388; bh=X0qT4kxgtZkZcZjUDwsZbf61aDrLdKsBk6xIjpmrxZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xA/1uYhEpBO0ItfvK847eH9I8LSjz9ZJVUXhTsf3lgxB4spLU7xTtVnMAfXbroRZv veI6LJXjz7p5IskkQ+/sXtwnn3uMAxX1tLAoEw+bG2xhgiNZenhU9OS314eHX881TQ m+Pbt/kxRq8ofTo17VzgWGGivgv99fT8dfe6gIeg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jingoo Han , Johan Hovold , Mark Brown , Sasha Levin Subject: [PATCH 6.1 400/522] spi: tegra20-sflash: fix controller deregistration Date: Tue, 16 Jun 2026 20:29:07 +0530 Message-ID: <20260616145144.783911694@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-tegra20-sflash.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -506,7 +506,7 @@ static int tegra_sflash_probe(struct pla 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 pl 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; }