From 80068c2d99eb2f1ed8194d2b7e73a16b322e9e18 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Nov 2021 12:18:25 +0100 Subject: [PATCH] 4.19-stable patches added patches: soc-tegra-pmc-fix-imbalanced-clock-disabling-in-error-code-path.patch --- queue-4.19/series | 1 + ...d-clock-disabling-in-error-code-path.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 queue-4.19/soc-tegra-pmc-fix-imbalanced-clock-disabling-in-error-code-path.patch diff --git a/queue-4.19/series b/queue-4.19/series index 8a50a8e31f3..d42e1a2736d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -318,3 +318,4 @@ rdma-netlink-add-__maybe_unused-to-static-inline-in-c-file.patch asoc-dapm-cover-regression-by-kctl-change-notification-fix.patch usb-max-3421-use-driver-data-instead-of-maintaining-a-list-of-bound-devices.patch hugetlbfs-flush-tlbs-correctly-after-huge_pmd_unshare.patch +soc-tegra-pmc-fix-imbalanced-clock-disabling-in-error-code-path.patch diff --git a/queue-4.19/soc-tegra-pmc-fix-imbalanced-clock-disabling-in-error-code-path.patch b/queue-4.19/soc-tegra-pmc-fix-imbalanced-clock-disabling-in-error-code-path.patch new file mode 100644 index 00000000000..1a9cb1a0471 --- /dev/null +++ b/queue-4.19/soc-tegra-pmc-fix-imbalanced-clock-disabling-in-error-code-path.patch @@ -0,0 +1,34 @@ +From 19221e3083020bd9537624caa0ee0145ed92ba36 Mon Sep 17 00:00:00 2001 +From: Dmitry Osipenko +Date: Tue, 2 Mar 2021 15:24:58 +0300 +Subject: soc/tegra: pmc: Fix imbalanced clock disabling in error code path + +From: Dmitry Osipenko + +commit 19221e3083020bd9537624caa0ee0145ed92ba36 upstream. + +The tegra_powergate_power_up() has a typo in the error code path where it +will try to disable clocks twice, fix it. In practice that error never +happens, so this is a minor correction. + +Tested-by: Peter Geis # Ouya T30 +Tested-by: Nicolas Chauvet # PAZ00 T20 and TK1 T124 +Tested-by: Matt Merhar # Ouya T30 +Signed-off-by: Dmitry Osipenko +Signed-off-by: Thierry Reding +Signed-off-by: Greg Kroah-Hartman +--- + drivers/soc/tegra/pmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/soc/tegra/pmc.c ++++ b/drivers/soc/tegra/pmc.c +@@ -396,7 +396,7 @@ static int tegra_powergate_power_up(stru + + err = tegra_powergate_enable_clocks(pg); + if (err) +- goto disable_clks; ++ goto powergate_off; + + usleep_range(10, 20); + -- 2.47.2