From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 11 Apr 2023 09:17:01 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pm8FQ-00HI9e-R0 for lore@lore.pengutronix.de; Tue, 11 Apr 2023 09:17:01 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pm8FE-0001ib-4T for lore@pengutronix.de; Tue, 11 Apr 2023 09:17:01 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YntgaD+heZ0CtINTqPCyBQqrRIpfEILfjHjWMnsZoOk=; b=mCdLb/rjv+Q9IPe29jGCgChRyX 4ZeZ9S2t8hM6Mew8bz2sgUY1Kz4AYLufgOQHsSlhyxQhC3sZjmUT/2WvvsNtubTnS5JlRqFSMI8um 4jI6cJXiDGMsGmPkQGGxq38PoMXaIozfA4IZurIIj1j3bgjfkE7UrHJHuKEMMZPK4bN9pQL3jChAJ nJo2f4xkE/RWD87UZ0m3sSWCtntinqA+sULAS3FhWumeck1nsvFwwr59sJqmB+Q993ol48PF1aFy6 uUKKK5jzcP7ERMEx6kA9C+GRWYrON4Ls+psLFbMIxV/pJsSgOaG9hPXqi6/uba+VfWpiZi/GYjcZv WXVt2CPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm8DJ-00Gg0d-0s; Tue, 11 Apr 2023 07:14:49 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pm8DH-00GfxH-0U for barebox@lists.infradead.org; Tue, 11 Apr 2023 07:14:48 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pm8DE-0000rH-12; Tue, 11 Apr 2023 09:14:44 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pm8DD-00ARvJ-6y; Tue, 11 Apr 2023 09:14:43 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pm8DB-006qNc-OQ; Tue, 11 Apr 2023 09:14:41 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 11 Apr 2023 09:14:27 +0200 Message-Id: <20230411071436.1630752-6-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411071436.1630752-1-a.fatoum@pengutronix.de> References: <20230411071436.1630752-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230411_001447_185031_C3BDC31C X-CRM114-Status: GOOD ( 10.65 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master 05/14] gpiolib: fix gpio label generation with gpiod_get X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Current mistaken use of con_id instead of _con_id, can lead to labels being called regulator.of-. Fix this, so the label becomes regulator.of instead. Fixes: 9fb2fa240d58 ("gpiolib: implement dev_gpiod_get_index") Signed-off-by: Ahmad Fatoum --- drivers/gpio/gpiolib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 736279875856..6ec63b1119b5 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -583,7 +583,7 @@ int dev_gpiod_get_index(struct device *dev, buf = NULL; if (!label) { - if (con_id) + if (_con_id) label = buf = basprintf("%s-%s", dev_name(dev), _con_id); else label = dev_name(dev); -- 2.39.2