| From d2cc3b861793a04d5d5a7f8c69fabdff661e923b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 27 Jun 2021 17:54:31 +0200 |
| Subject: soc/tegra: Fix an error handling path in tegra_powergate_power_up() |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 986b5094708e508baa452a23ffe809870934a7df ] |
| |
| If an error occurs after a successful tegra_powergate_enable_clocks() |
| call, it must be undone by a tegra_powergate_disable_clocks() call, as |
| already done in the below and above error handling paths of this function. |
| |
| Update the 'goto' to branch at the correct place of the error handling |
| path. |
| |
| Fixes: a38045121bf4 ("soc/tegra: pmc: Add generic PM domain support") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Reviewed-by: Jon Hunter <jonathanh@nvidia.com> |
| Signed-off-by: Thierry Reding <treding@nvidia.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/soc/tegra/pmc.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c |
| index 0447afa970f5e..ab75f41e9c0c9 100644 |
| --- a/drivers/soc/tegra/pmc.c |
| +++ b/drivers/soc/tegra/pmc.c |
| @@ -591,7 +591,7 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg, |
| |
| err = reset_control_deassert(pg->reset); |
| if (err) |
| - goto powergate_off; |
| + goto disable_clks; |
| |
| usleep_range(10, 20); |
| |
| -- |
| 2.33.0 |
| |
