mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PM / devfreq: Fix static checker warning in try_then_request_governor

Browse source 
The patch 23c7b54ca1: "PM / devfreq: Fix devfreq_add_device() when
drivers are built as modules." leads to the following static checker
warning:

    drivers/devfreq/devfreq.c:1043 governor_store()
    warn: 'governor' can also be NULL

The reason is that the try_then_request_governor() function returns both
error pointers and NULL. It should just return error pointers, so fix
this by returning a ERR_PTR to the error intead of returning NULL.

Fixes: 23c7b54ca1 ("PM / devfreq: Fix devfreq_add_device() when drivers are built as modules.")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
This commit is contained in:
Enric Balletbo i Serra 2019-03-13 13:22:53 +01:00 committed by MyungJoo Ham
parent bc658bef97
commit b53b012805
1 changed files with 2 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/devfreq/devfreq.c
View file

@ -228,7 +228,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name)
* if is not found. This can happen when both drivers (the governor driver * if is not found. This can happen when both drivers (the governor driver
* and the driver that call devfreq_add_device) are built as modules. * and the driver that call devfreq_add_device) are built as modules.
* devfreq_list_lock should be held by the caller. Returns the matched * devfreq_list_lock should be held by the caller. Returns the matched
* governor's pointer. * governor's pointer or an error pointer.
*/ */
static struct devfreq_governor *try_then_request_governor(const char *name) static struct devfreq_governor *try_then_request_governor(const char *name)
{ {
@ -254,7 +254,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name)
/* Restore previous state before return */ /* Restore previous state before return */
mutex_lock(&devfreq_list_lock); mutex_lock(&devfreq_list_lock);
if (err) if (err)
return NULL; return ERR_PTR(err);
governor = find_devfreq_governor(name); governor = find_devfreq_governor(name);
} }