| Message ID | 161848824278.29796.10119141602469930229.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers | show |
| Series | [thermal:,thermal/next] thermal/drivers/devfreq_cooling: Fix wrong return on error path | expand |
diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index fb250ac..3a788ac 100644 --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c @@ -402,7 +402,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, if (err < 0) goto free_table; - cdev = ERR_PTR(-ENOMEM); + err = -ENOMEM; name = kasprintf(GFP_KERNEL, "devfreq-%s", dev_name(dev)); if (!name) goto remove_qos_req;
The following commit has been merged into the thermal/next branch of thermal: Commit-ID: 9aa80ab2c0ba67ce3281aee604b543293f71390d Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//9aa80ab2c0ba67ce3281aee604b543293f71390d Author: Daniel Lezcano <daniel.lezcano@linaro.org> AuthorDate: Fri, 19 Mar 2021 21:24:23 +01:00 Committer: Daniel Lezcano <daniel.lezcano@linaro.org> CommitterDate: Thu, 15 Apr 2021 13:21:16 +02:00 thermal/drivers/devfreq_cooling: Fix wrong return on error path The following error is reported by kbuild: smatch warnings: drivers/thermal/devfreq_cooling.c:433 of_devfreq_cooling_register_power() warn: passing zero to 'ERR_PTR' Fix the error code by the setting the 'err' variable instead of 'cdev'. Fixes: f8d354e821b2 ("thermal/drivers/devfreq_cooling: Use device name instead of auto-numbering") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20210319202424.890968-1-daniel.lezcano@linaro.org --- drivers/thermal/devfreq_cooling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)