Commit 6b110830 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Greg Kroah-Hartman

PM / devfreq: Fix static checker warning in try_then_request_governor

[ Upstream commit b53b0128 ]

The patch 23c7b54c: "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: 23c7b54c ("PM / devfreq: Fix devfreq_add_device() when drivers are built as modules.")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d1546745
...@@ -228,7 +228,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name) ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment