thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe
authorKang Chen <void0red@hust.edu.cn>
Wed, 19 Apr 2023 02:07:48 +0000 (10:07 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:37 +0000 (23:03 +0900)
[ Upstream commit f05c7b7d9ea9477fcc388476c6f4ade8c66d2d26 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/thermal/mtk_thermal.c

index 8440692..62f1e69 100644 (file)
@@ -1028,7 +1028,12 @@ static int mtk_thermal_probe(struct platform_device *pdev)
                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);
@@ -1044,7 +1049,12 @@ static int mtk_thermal_probe(struct platform_device *pdev)
                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);