mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
c36de2e73a
Backport almost 50 commits from upstream Linux to improve thermal drivers for MediaTek SoCs and add new LVTS driver for MT7988. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 458fa1d508de3f17e49d974a0158d9aeff273a58 Mon Sep 17 00:00:00 2001
|
|
From: Kang Chen <void0red@hust.edu.cn>
|
|
Date: Wed, 19 Apr 2023 10:07:48 +0800
|
|
Subject: [PATCH 18/42] thermal/drivers/mediatek: Use devm_of_iomap to avoid
|
|
resource leak in mtk_thermal_probe
|
|
|
|
Smatch reports:
|
|
1. mtk_thermal_probe() warn: 'apmixed_base' from of_iomap() not released.
|
|
2. mtk_thermal_probe() warn: 'auxadc_base' from of_iomap() not released.
|
|
|
|
The original code forgets to release iomap resource when handling errors,
|
|
fix it by switch to devm_of_iomap.
|
|
|
|
Fixes: 89945047b166 ("thermal: mediatek: Add tsensor support for V2 thermal system")
|
|
Signed-off-by: Kang Chen <void0red@hust.edu.cn>
|
|
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230419020749.621257-1-void0red@hust.edu.cn
|
|
---
|
|
drivers/thermal/mediatek/auxadc_thermal.c | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/thermal/mediatek/auxadc_thermal.c
|
|
+++ b/drivers/thermal/mediatek/auxadc_thermal.c
|
|
@@ -1232,7 +1232,12 @@ static int mtk_thermal_probe(struct plat
|
|
return -ENODEV;
|
|
}
|
|
|
|
- auxadc_base = of_iomap(auxadc, 0);
|
|
+ auxadc_base = devm_of_iomap(&pdev->dev, auxadc, 0, NULL);
|
|
+ if (IS_ERR(auxadc_base)) {
|
|
+ of_node_put(auxadc);
|
|
+ return PTR_ERR(auxadc_base);
|
|
+ }
|
|
+
|
|
auxadc_phys_base = of_get_phys_base(auxadc);
|
|
|
|
of_node_put(auxadc);
|
|
@@ -1248,7 +1253,12 @@ static int mtk_thermal_probe(struct plat
|
|
return -ENODEV;
|
|
}
|
|
|
|
- apmixed_base = of_iomap(apmixedsys, 0);
|
|
+ apmixed_base = devm_of_iomap(&pdev->dev, apmixedsys, 0, NULL);
|
|
+ if (IS_ERR(apmixed_base)) {
|
|
+ of_node_put(apmixedsys);
|
|
+ return PTR_ERR(apmixed_base);
|
|
+ }
|
|
+
|
|
apmixed_phys_base = of_get_phys_base(apmixedsys);
|
|
|
|
of_node_put(apmixedsys);
|