From patchwork Thu Jul 27 23:26:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Borneo X-Patchwork-Id: 9867683 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 33090601A1 for ; Thu, 27 Jul 2017 23:27:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A17428865 for ; Thu, 27 Jul 2017 23:27:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CDA62886C; Thu, 27 Jul 2017 23:27: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=-1.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DBD228865 for ; Thu, 27 Jul 2017 23:27:18 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 060DC26760A; Fri, 28 Jul 2017 01:27:17 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id B9A2D26760B; Fri, 28 Jul 2017 01:27:15 +0200 (CEST) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by alsa0.perex.cz (Postfix) with ESMTP id 1E4A7266A8A for ; Fri, 28 Jul 2017 01:27:12 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id 12so17364210wrb.4 for ; Thu, 27 Jul 2017 16:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=J5dNrZ9h8wfNziT2qDJWyCb4IlzGP7iGWWgLhSFw+K8=; b=mnpo/X0cv7H5TsdEKuuKg/hi6ZzHvVTrDO1dN0PzfG/wdLOjKByhMc6BuIzk5SgQFI 9KsXmCyWCXMsMBhI6T1AHaZH2AN+/jox6lNG46+cWA7g61r9H+cwZDpHE210FcMRDt6c +Lpu4ADKXpL4Ck4ywHom6S3gmAtfxwQUkJ2PQ791Va5+SFxITWtX2Bj6mz+kot4bOqZO xL0SGOjkuvIq0rdks/3CfyKog+iCIxAb0SegAcoj4BOUCNXIDnxNKGpwAUYGD30EOhRs Tnb1kwUlUTz0l9vXQb9OZwWX3fxuRSUzeCZGk7w/pea6VRj0WIkA69PR/rU8nsgOAku1 MmBw== 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:in-reply-to:references; bh=J5dNrZ9h8wfNziT2qDJWyCb4IlzGP7iGWWgLhSFw+K8=; b=ekuoDYI6I4gYwJ7lX7jg3iq6bfaYe6iV1RW1G8oxse5BLmVnHqx2bvfct7Egw0+gDa OqMTi/fT+trpjn5jhSavS4VaNrUjkLEqZSJ8T1uRdTCmrFkILEiQResRS2GTkrJdqY+m FKPB6OYfQNwX1gtQoymAeyv227/s9aqKTQtLD3bdcrO8OvfLlF8Fwx+lnlUv6sKoQKrC zXdp6dzWrdXQaYF4WrS2c8uQS8F9K0/6qtxljLwWPa4FuKnf1hPueENjEOojPCxQbKR8 6lTUNQzM8IWOZrm5VUEImM3dzfEFbpPee/HUgs+jPf0Wz5IXliH3Th91+NXHdnnqUD1o /Zrg== X-Gm-Message-State: AIVw113aH5kGlvwYUZkFCGvdcuNDTSWwoCBE6/nl2GeC5FDNMOD8G+Cy KAxJt+T79yH8dg== X-Received: by 10.223.154.203 with SMTP id a69mr4695199wrc.139.1501198032466; Thu, 27 Jul 2017 16:27:12 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:edb8:72e0:f7c2:bbb1:de32:ba2a]) by smtp.gmail.com with ESMTPSA id t62sm2977044wmb.24.2017.07.27.16.27.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jul 2017 16:27:11 -0700 (PDT) From: Antonio Borneo X-Google-Original-From: Antonio Borneo To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org Date: Fri, 28 Jul 2017 01:26:10 +0200 Message-Id: <20170727232612.23543-2-antonio.borneo@st.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170727232612.23543-1-antonio.borneo@st.com> References: <20170727232612.23543-1-antonio.borneo@st.com> In-Reply-To: <20170725214952.6491-1-borneo.antonio@gmail.com> References: <20170725214952.6491-1-borneo.antonio@gmail.com> Cc: Kuninori Morimoto , linux-kernel@vger.kernel.org, Wei Xu , Antonio Borneo , John Stultz , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH v2 1/3] ASoC: fix use of of_node_put() in of_for_each_phandle() loops X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Antonio Borneo On Hikey target board, enabling CONFIG_OF_DYNAMIC triggers several errors at kernel boot, like the following one OF: ERROR: Bad of_node_put() on /soc/i2s@f7118000/ports/port@0 each followed by stack dump. Each iteration of of_for_each_phandle(){} already provides the needed of_node_put(); adding one more in the body of the loop triggers the error. Fixed by removing the wrong of_node_put(), but adding it when the loop is break out. Tested with kernel v4.13-rc2 with hikey_defconfig taken from https://git.linaro.org/people/john.stultz/android-dev.git branch dev/hikey-mainline-WIP This fixes commit 2692c1c63c29 ("ASoC: add audio-graph-card support"). Signed-off-by: Antonio Borneo --- To: Liam Girdwood To: Mark Brown To: Jaroslav Kysela To: Takashi Iwai To: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Cc: Wei Xu Cc: John Stultz Cc: linux-arm-kernel@lists.infradead.org Cc: Kuninori Morimoto --- sound/soc/generic/audio-graph-card.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 105ec3a..20c2029 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -224,9 +224,10 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) of_for_each_phandle(&it, rc, node, "dais", NULL, 0) { ret = asoc_graph_card_dai_link_of(it.node, priv, idx++); - of_node_put(it.node); - if (ret < 0) + if (ret < 0) { + of_node_put(it.node); return ret; + } } return asoc_simple_card_parse_card_name(card, NULL); @@ -239,10 +240,8 @@ static int asoc_graph_get_dais_count(struct device *dev) int count = 0; int rc; - of_for_each_phandle(&it, rc, node, "dais", NULL, 0) { + of_for_each_phandle(&it, rc, node, "dais", NULL, 0) count++; - of_node_put(it.node); - } return count; }