From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CA44C432C3 for ; Fri, 22 Nov 2019 11:06:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56612208A1 for ; Fri, 22 Nov 2019 11:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420783; bh=b1zZCWHgviqi7cGaVJbe44nWhVRzGNjrthtf+9iCCxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k1yM2XDNljwbs0nxsK1gk1MKI/ZQLuz8jrf5A7VbALPcG+bPR8jw1Eyy5Gxqa611M UHkePqNMZnjChuLbZyX1J6fjWWu+zhQVO4GV7Ldiaz2R+ldVlOCDalrOW2Hn0ztU/M 1JRpysDj4T4AyPZg84GnI+reLzXbGX7b7qxeORW4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731855AbfKVLGW (ORCPT ); Fri, 22 Nov 2019 06:06:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:34514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731848AbfKVLGU (ORCPT ); Fri, 22 Nov 2019 06:06:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 20B9A2075E; Fri, 22 Nov 2019 11:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420779; bh=b1zZCWHgviqi7cGaVJbe44nWhVRzGNjrthtf+9iCCxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yzcAH0zrzb9bs+OSAEqkzSZChitboIKXfwrT4OH7oA1a6GRYi5zRMiRPtkCLgxst7 SP/FtkJ5L9be4MrW3zb9NOWKI53bZGqIYlo7ADUHCryqOOrXOAi1tVEBwNp2nHAyYl sJCpGILMZKu8Us3c8n0CKM1L4+J58xDWocZFM82s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Enric Balletbo i Serra , Chanwoo Choi , MyungJoo Ham , Sasha Levin Subject: [PATCH 4.19 216/220] PM / devfreq: Fix static checker warning in try_then_request_governor Date: Fri, 22 Nov 2019 11:29:41 +0100 Message-Id: <20191122100929.173069944@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Enric Balletbo i Serra [ 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: Dan Carpenter Signed-off-by: Enric Balletbo i Serra Reviewed-by: Chanwoo Choi Signed-off-by: MyungJoo Ham Signed-off-by: Sasha Levin --- drivers/devfreq/devfreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index bcd2279106760..e2ab46bfa666e 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -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 * and the driver that call devfreq_add_device) are built as modules. * 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) { @@ -257,7 +257,7 @@ static struct devfreq_governor *try_then_request_governor(const char *name) /* Restore previous state before return */ mutex_lock(&devfreq_list_lock); if (err) - return NULL; + return ERR_PTR(err); governor = find_devfreq_governor(name); } -- 2.20.1