Skip to content

Commit

Permalink
thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in…
Browse files Browse the repository at this point in the history
… mtk_thermal_probe

[ Upstream commit f05c7b7 ]

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: 8994504 ("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>
  • Loading branch information
void0red authored and gregkh committed May 11, 2023
1 parent 032c5d8 commit e83b320
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/thermal/mediatek/auxadc_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,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);
Expand All @@ -1158,7 +1163,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);
Expand Down

0 comments on commit e83b320

Please sign in to comment.