| Message ID | 166125860068.401.6527171705353525583.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers | show |
| Series | [thermal:,thermal/next] thermal/of: Fix error code in of_thermal_zone_find() | expand |
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c index 82236fe..15b342f 100644 --- a/drivers/thermal/thermal_of.c +++ b/drivers/thermal/thermal_of.c @@ -1102,6 +1102,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int } } } + tz = ERR_PTR(-EINVAL); out: of_node_put(np); return tz;
The following commit has been merged into the thermal/next branch of thermal: Commit-ID: 45b8850b3d3071d5ea9e19ad4a29ad5f0b5d1ec1 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//45b8850b3d3071d5ea9e19ad4a29ad5f0b5d1ec1 Author: Dan Carpenter <dan.carpenter@oracle.com> AuthorDate: Tue, 09 Aug 2022 10:56:26 +02:00 Committer: Daniel Lezcano <daniel.lezcano@linaro.org> CommitterDate: Wed, 17 Aug 2022 14:09:37 +02:00 thermal/of: Fix error code in of_thermal_zone_find() Currently, if we cannot find the correct thermal zone then this error path returns NULL and it would lead to an Oops in the caller. Return ERR_PTR(-EINVAL) instead. Fixes: 3bd52ac87347 ("thermal/of: Rework the thermal device tree initialization") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/YvDzovkMCQecPDjz@kili Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/thermal_of.c | 1 + 1 file changed, 1 insertion(+)