From patchwork Mon Jul 16 13:32:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 10526793 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 87E31600D0 for ; Mon, 16 Jul 2018 13:33:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7918428761 for ; Mon, 16 Jul 2018 13:33:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D3D928775; Mon, 16 Jul 2018 13:33:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 146B428767 for ; Mon, 16 Jul 2018 13:33:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728033AbeGPOAj (ORCPT ); Mon, 16 Jul 2018 10:00:39 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:36871 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727372AbeGPOAi (ORCPT ); Mon, 16 Jul 2018 10:00:38 -0400 Received: by mail-lj1-f194.google.com with SMTP id v9-v6so19651560ljk.4 for ; Mon, 16 Jul 2018 06:33:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yShMAaA+3wrToiOuYhqJLwnCV7tYvrx9fUOx2YE4kSU=; b=ajnR8T6rt5JMTJPD3F3S501SEo5tVzodar6zcmqv9k1r3DXXlaUiqTKBJ8NRULC24S IV/gI8DdqKRkjQjKPANw5wbfQ/RaeePFjlgznhMQLzhti7m0hIcjuNUTukhkWOtWpNGu ezROY3o5iQM8tN0GltTKH/40Klq2qrJNY4auc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yShMAaA+3wrToiOuYhqJLwnCV7tYvrx9fUOx2YE4kSU=; b=UPvQnuoKjffWk1erax3Z+v5snvOrhE5Qjyop3Frz9glFR7wENgTdgagBQKGwkh2aVn 0nrOMxpXZ86eWp7YI0MvKfYObp272atncVl/7Wlj2gtA8denxPi6vnI5MtxhBo1kszyg Vmc2dcePFPeBq/7Y8i9aGSA78yHHFn1Q7/XFBXkZQXNYEfmONiv/W88th59m4K56kWo+ tyx0ARcxGxAGVrn9o4+mw7lNCWhcLOwAcAD07NDCouGeBwaea/PuR7IokXlzazJeEMFy UJxrxe4ONOMpOxhMwXFe0noeT17K8hOAEkLzBmkqDDPy7i8TDTGXDtL6aocDIGyAy4ke O3bw== X-Gm-Message-State: AOUpUlFmgP8d6vLANliwzRkdqLm4ev0wluOwuUZnbZgCcpy6zIjgFp27 M5GZfVJ/OknU3wFbNgf4krzlUg== X-Google-Smtp-Source: AAOMgpeE+QRsEWexCOFR09NCLZc2Qj5UXl4Vhq70qfsxdcqkaaWaS6S+Gb1XY9Z5Jklcq/pVogUGzQ== X-Received: by 2002:a2e:1b83:: with SMTP id c3-v6mr4016734ljf.0.1531747989459; Mon, 16 Jul 2018 06:33:09 -0700 (PDT) Received: from centauri.lan (h-229-118.A785.priv.bahnhof.se. [5.150.229.118]) by smtp.gmail.com with ESMTPSA id a14-v6sm3820390ljb.49.2018.07.16.06.33.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Jul 2018 06:33:08 -0700 (PDT) From: Niklas Cassel To: broonie@kernel.org, Liam Girdwood Cc: linux-arm-msm@vger.kernel.org, johan@kernel.org, Niklas Cassel , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] regulator: qcom_spmi: Fix warning Bad of_node_put() Date: Mon, 16 Jul 2018 15:32:51 +0200 Message-Id: <20180716133255.1506-2-niklas.cassel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180716133255.1506-1-niklas.cassel@linaro.org> References: <20180716133255.1506-1-niklas.cassel@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For of_find_node_by_name(), you typically pass what the previous call returned. Therefore, of_find_node_by_name() increases the refcount of the returned node, and decreases the refcount of the node passed as the first argument. of_find_node_by_name() is incorrectly used, and produces a warning. Fix the warning by using the more suitable function of_get_child_by_name(). Also add a missing of_node_put() for the returned value, since this was previously being leaked. OF: ERROR: Bad of_node_put() on /soc/qcom,spmi@400f000/pmic@3/regulators CPU: 1 PID: 1 Comm: swapper/0 Tainted: G W 4.18.0-rc4-00223-gefd7b360b70e #12 Hardware name: Qualcomm Technologies, Inc. DB820c (DT) Call trace: dump_backtrace+0x0/0x1a8 show_stack+0x14/0x20 dump_stack+0x90/0xb4 of_node_release+0x74/0x78 kobject_put+0x90/0x1f0 of_node_put+0x14/0x20 of_find_node_by_name+0x80/0xd8 qcom_spmi_regulator_probe+0x30c/0x508 Fixes: 0caecaa87202 ("regulator: qcom_spmi: Add support for SAW") Signed-off-by: Niklas Cassel --- Changes since v1: -Use of_get_child_by_name() instead of of_find_node_by_name(). drivers/regulator/qcom_spmi-regulator.c | 32 +++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index 9817f1a75342..4cc14c65d86b 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -1752,7 +1752,8 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) const char *name; struct device *dev = &pdev->dev; struct device_node *node = pdev->dev.of_node; - struct device_node *syscon; + struct device_node *syscon, *reg_node; + struct property *reg_prop; int ret, lenp; struct list_head *vreg_list; @@ -1780,10 +1781,13 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) for (reg = match->data; reg->name; reg++) { - if (saw_regmap && \ - of_find_property(of_find_node_by_name(node, reg->name), \ - "qcom,saw-slave", &lenp)) { - continue; + if (saw_regmap) { + reg_node = of_get_child_by_name(node, reg->name); + reg_prop = of_find_property(reg_node, "qcom,saw-slave", + &lenp); + of_node_put(reg_node); + if (reg_prop) + continue; } vreg = devm_kzalloc(dev, sizeof(*vreg), GFP_KERNEL); @@ -1816,13 +1820,17 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) if (ret) continue; - if (saw_regmap && \ - of_find_property(of_find_node_by_name(node, reg->name), \ - "qcom,saw-leader", &lenp)) { - spmi_saw_ops = *(vreg->desc.ops); - spmi_saw_ops.set_voltage_sel = \ - spmi_regulator_saw_set_voltage; - vreg->desc.ops = &spmi_saw_ops; + if (saw_regmap) { + reg_node = of_get_child_by_name(node, reg->name); + reg_prop = of_find_property(reg_node, "qcom,saw-leader", + &lenp); + of_node_put(reg_node); + if (reg_prop) { + spmi_saw_ops = *(vreg->desc.ops); + spmi_saw_ops.set_voltage_sel = + spmi_regulator_saw_set_voltage; + vreg->desc.ops = &spmi_saw_ops; + } } config.dev = dev;