Message ID | f8e4716278b0a6fe7d9e5537715eb21dcd991d1d.1684930647.git.geert+renesas@glider.be |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2811773vqo; Wed, 24 May 2023 05:34:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7G4NuXKtaFH1VxwiGu/3XoLKDOAto4QQAvTmebvgHzf+RXa/a6HXBU9YaoFw9cxIyTeGvQ X-Received: by 2002:a05:6a20:3d0e:b0:10b:96be:ca35 with SMTP id y14-20020a056a203d0e00b0010b96beca35mr10988005pzi.28.1684931644098; Wed, 24 May 2023 05:34:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684931644; cv=none; d=google.com; s=arc-20160816; b=xBH6jAkqCbqgO4shUuNNSSa6vsnokduL3jaU7kqLnmTzoPvEwtW+MbVF8sANjxIl3v H04EbBvish40FHyV0HhDCfjixo6lPSomo6znW6lkQwwkPNbK65QTBiYAYB7DrB0nwBSt YRe5c1YVs1x3WEkwU7nkb8RuvXs84L9B6RvY82HOqoNqtmGBV5OJaRVImoWtixRGv3rA aGMOtJvL0mnLQin3Z9OIg1jbeVRn3UnUA49Z6dK/U02SgzA5IeYul2u8n85VBCUzJ7Q7 l+T6PC5bQIz0JoL7EMK6HRhEcpbhX9BkJX134ZTa7leFqN/qAi5nuMzGgj+2fCr0B1ee ljRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=PCizjfO687RH0Ch+ggLJGGH34Zydf++kdVhgZ0USbvg=; b=RvtVTJ3ko4Z1mbfw8YCBZM4bshYcitXAIObFMQSPdqNVxlV/tBcwwxqJ96SopTnm7Q tZv/seooq288iFPiKMmqynqjNLJoD+IIDLL0JoIQSr1RErxF573vUIevqdsgFQ8Dxt/X jzdObI6h4x2KIkGqdvrJqdrDBl9IR9JTvuBjI3c4OUDG3gG0h8khhRjzkc4ZNCvSVCLp r8F8G7jxYNeu225RHbp0rfkgtmL+ZgbxuSy4bWGcmrqX9falsCGxW/rR6nN3y3eIlthL RF58BLQu6iFK2eq16dNkb0jQhIghyqjRjrC1TeFoF+ShpDPGd9UMj9NjU9my6HZ6fo4+ K27Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e5-20020a636905000000b005132342a587si684038pgc.610.2023.05.24.05.33.50; Wed, 24 May 2023 05:34:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232199AbjEXMWf (ORCPT <rfc822;ahmedalshaiji.dev@gmail.com> + 99 others); Wed, 24 May 2023 08:22:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231422AbjEXMW0 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 24 May 2023 08:22:26 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6213F9E for <linux-kernel@vger.kernel.org>; Wed, 24 May 2023 05:22:22 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:59b9:3473:f0ae:e2b7]) by laurent.telenet-ops.be with bizsmtp id 0cNL2A00C5NiV2701cNLTe; Wed, 24 May 2023 14:22:20 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from <geert@linux-m68k.org>) id 1q1nVF-002xw9-Aj; Wed, 24 May 2023 14:22:20 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from <geert@linux-m68k.org>) id 1q1nVU-00DPCA-C7; Wed, 24 May 2023 14:22:20 +0200 From: Geert Uytterhoeven <geert+renesas@glider.be> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Osama Muhammad <osmtendev@gmail.com> Cc: linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH v2 1/2] regulator: core: Fix more error checking for debugfs_create_dir() Date: Wed, 24 May 2023 14:22:17 +0200 Message-Id: <f8e4716278b0a6fe7d9e5537715eb21dcd991d1d.1684930647.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: <cover.1684930647.git.geert+renesas@glider.be> References: <cover.1684930647.git.geert+renesas@glider.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766778883587325569?= X-GMAIL-MSGID: =?utf-8?q?1766778883587325569?= |
Series |
regulator: core: Fix error checking and messages
|
|
Commit Message
Geert Uytterhoeven
May 24, 2023, 12:22 p.m. UTC
In case of failure, debugfs_create_dir() does not return NULL, but an
error pointer. Most incorrect error checks were fixed, but the one in
create_regulator() was forgotten.
Fix the remaining error check.
Fixes: 2bf1c45be3b8f3a3 ("regulator: Fix error checking for debugfs_create_dir")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
- Split off from "regulator: core: Streamline debugfs operations".
---
drivers/regulator/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Wed, May 24, 2023 at 02:22:17PM +0200, Geert Uytterhoeven wrote: > In case of failure, debugfs_create_dir() does not return NULL, but an > error pointer. Most incorrect error checks were fixed, but the one in > create_regulator() was forgotten. This breaks the build: /build/stage/linux/drivers/regulator/core.c:1916:11: error: expected identifier or ‘(’ before ‘else’ 1916 | } else { | ^~~~ /build/stage/linux/drivers/regulator/core.c:1933:9: error: expected identifier o r ‘(’ before ‘if’ 1933 | if (!regulator_ops_is_valid(rdev, REGULATOR_CHANGE_STATUS) && | ^~ /build/stage/linux/drivers/regulator/core.c:1937:9: error: expected identifier o r ‘(’ before ‘return’ 1937 | return regulator; | ^~~~~~ /build/stage/linux/drivers/regulator/core.c:1938:1: error: expected identifier or ‘(’ before ‘}’ token 1938 | } | ^
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 698ab7f5004bf6b7..ad8baf65f63e369b 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1911,7 +1911,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, if (err != -EEXIST) regulator->debugfs = debugfs_create_dir(supply_name, rdev->debugfs); - if (!regulator->debugfs) { + if (IS_ERR(regulator->debugfs)) rdev_dbg(rdev, "Failed to create debugfs directory\n"); } else { debugfs_create_u32("uA_load", 0444, regulator->debugfs,