提交 4039b5dd 编写于 作者: E Enric Balletbo i Serra 提交者: Greg Kroah-Hartman

PM / devfreq: Fix static checker warning in try_then_request_governor

[ Upstream commit b53b0128052ffd687797d5f4deeb76327e7b5711 ]

The patch 23c7b54ca1cd: "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: 23c7b54ca1cd ("PM / devfreq: Fix devfreq_add_device() when drivers are built as modules.")
Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: NEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: NChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: NMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 903cfafe
...@@ -231,7 +231,7 @@ static struct devfreq_governor *find_devfreq_governor(const char *name) ...@@ -231,7 +231,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)
{ {
...@@ -257,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name) ...@@ -257,7 +257,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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册