From nobody Mon Apr 27 03:23:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8813FC433EF for ; Fri, 17 Jun 2022 10:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381350AbiFQKxS (ORCPT ); Fri, 17 Jun 2022 06:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380887AbiFQKxR (ORCPT ); Fri, 17 Jun 2022 06:53:17 -0400 Received: from m15112.mail.126.com (m15112.mail.126.com [220.181.15.112]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EC00722B16 for ; Fri, 17 Jun 2022 03:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=TBVpT Xi3mOGroTRFtYnS2jF3N9afbBUgGy+vsR5qfSA=; b=kHjwl+p3FRM3LWROajx8p B3PCa9VMs4dEAt1MfUAIk1mN/6SLkv9dENRbifemO3CLOt34K9jVC9iwr9QS2u2c 4DchzsaXwMOltmFCcbUrsobZLdsZk2d1Q/Eng4nfXYujRazUFo8TbNHTyn3KOhU3 vaW4RQ7P4JmwVU2242zu50= Received: from localhost.localdomain (unknown [124.16.139.61]) by smtp2 (Coremail) with SMTP id DMmowAA3oPxkXKxipQEODg--.20553S2; Fri, 17 Jun 2022 18:50:12 +0800 (CST) From: Liang He To: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, christophe.leroy@csgroup.eu, nixiaoming@huawei.com Cc: windhl@126.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v5] powerpc:85xx: Add missing of_node_put() in sgy_cst1000 Date: Fri, 17 Jun 2022 18:50:11 +0800 Message-Id: <20220617105011.4041123-1-windhl@126.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: DMmowAA3oPxkXKxipQEODg--.20553S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZFWDtF4DCFW5Jw4fKw18AFb_yoW5uw17pF Z8CrZakrWkGw1xGas3tayDuFy2yw18t3yxJ34fGan7C34UX34qqry0yFyrWrnIgrW8C3yr Jr1aya40kFZrAaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zR-J5cUUUUU= X-Originating-IP: [124.16.139.61] X-CM-SenderInfo: hzlqvxbo6rjloofrz/1tbi7QUjF1pEAN95NwAAsT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In gpio_halt_probe(), of_find_matching_node() will return a node pointer with refcount incremented. We should use of_node_put() in fail path or when it is not used anymore. Signed-off-by: Liang He --- changelog: v5: fix 'gotot' error introduced by v4 and use cross-compiler to test=20 v4: reuse exist 'err' and use a simple code style, advised by CJ v3: use local 'child_node' advised by Michael. v2: use goto-label patch style advised by Christophe Leroy. v1: add of_node_put() before each exit. arch/powerpc/platforms/85xx/sgy_cts1000.c | 35 ++++++++++++++--------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platf= orms/85xx/sgy_cts1000.c index 98ae64075193..e14d1b74d4e4 100644 --- a/arch/powerpc/platforms/85xx/sgy_cts1000.c +++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c @@ -71,6 +71,7 @@ static int gpio_halt_probe(struct platform_device *pdev) { enum of_gpio_flags flags; struct device_node *node =3D pdev->dev.of_node; + struct device_node *child_node; int gpio, err, irq; int trigger; =20 @@ -78,26 +79,29 @@ static int gpio_halt_probe(struct platform_device *pdev) return -ENODEV; =20 /* If there's no matching child, this isn't really an error */ - halt_node =3D of_find_matching_node(node, child_match); - if (!halt_node) + child_node =3D of_find_matching_node(node, child_match); + if (!child_node) return 0; =20 /* Technically we could just read the first one, but punish * DT writers for invalid form. */ - if (of_gpio_count(halt_node) !=3D 1) - return -EINVAL; + if (of_gpio_count(child_node) !=3D 1) { + err =3D -EINVAL; + goto err_put; + } =20 /* Get the gpio number relative to the dynamic base. */ - gpio =3D of_get_gpio_flags(halt_node, 0, &flags); - if (!gpio_is_valid(gpio)) - return -EINVAL; + gpio =3D of_get_gpio_flags(child_node, 0, &flags); + if (!gpio_is_valid(gpio)) { + err =3D -EINVAL; + goto err_put; + } =20 err =3D gpio_request(gpio, "gpio-halt"); if (err) { printk(KERN_ERR "gpio-halt: error requesting GPIO %d.\n", gpio); - halt_node =3D NULL; - return err; + goto err_put; } =20 trigger =3D (flags =3D=3D OF_GPIO_ACTIVE_LOW); @@ -105,15 +109,14 @@ static int gpio_halt_probe(struct platform_device *pd= ev) gpio_direction_output(gpio, !trigger); =20 /* Now get the IRQ which tells us when the power button is hit */ - irq =3D irq_of_parse_and_map(halt_node, 0); + irq =3D irq_of_parse_and_map(child_node, 0); err =3D request_irq(irq, gpio_halt_irq, IRQF_TRIGGER_RISING | - IRQF_TRIGGER_FALLING, "gpio-halt", halt_node); + IRQF_TRIGGER_FALLING, "gpio-halt", child_node); if (err) { printk(KERN_ERR "gpio-halt: error requesting IRQ %d for " "GPIO %d.\n", irq, gpio); gpio_free(gpio); - halt_node =3D NULL; - return err; + goto err_put; } =20 /* Register our halt function */ @@ -123,7 +126,12 @@ static int gpio_halt_probe(struct platform_device *pde= v) printk(KERN_INFO "gpio-halt: registered GPIO %d (%d trigger, %d" " irq).\n", gpio, trigger, irq); =20 + halt_node =3D child_node; return 0; + +err_put: + of_node_put(child_node); + return err; } =20 static int gpio_halt_remove(struct platform_device *pdev) @@ -139,6 +147,7 @@ static int gpio_halt_remove(struct platform_device *pde= v) =20 gpio_free(gpio); =20 + of_node_put(halt_node); halt_node =3D NULL; } =20 --=20 2.25.1