From patchwork Thu Jul 27 23:26:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Borneo X-Patchwork-Id: 9867695 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 97227601A1 for ; Thu, 27 Jul 2017 23:27:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A45728865 for ; Thu, 27 Jul 2017 23:27:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F28A2886C; Thu, 27 Jul 2017 23:27:48 +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 E20C828865 for ; Thu, 27 Jul 2017 23:27:47 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8934726761B; Fri, 28 Jul 2017 01:27:31 +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 8BF3E26761B; Fri, 28 Jul 2017 01:27:29 +0200 (CEST) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by alsa0.perex.cz (Postfix) with ESMTP id ADC55267613 for ; Fri, 28 Jul 2017 01:27:19 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id g32so8122005wrd.5 for ; Thu, 27 Jul 2017 16:27:19 -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=Al5SKR037FpbIfHPnQpIsF4wgoIL5JGwFLMy1M47Blk=; b=p9ZZuZZTOQgTt6oVTjeMUMKVzoVx8M967niTXRy6VfwgFhRm4Nt/g4SUroKabBzfXz b2QCi0g2Sevk+c1ADZ1h7PL6WInqCLD2HYzS/84axtTftvFy1FNshQAY4b+Y0IydnHzH A1Gg82+wwBt/ZZ/RkmTWWiDZcwphGG1QPAyw778f+Zk02ig9OmmqJ7/cW6etonYT3lz2 G2O4HMMD46+UxKTDGZTsIeGfEyJ3Vz6eeAyNMEfHRxeYWqL6vmmK/A7YFuf0Iltug+vM ZpxpLjb7yZCZbFeKijdMc7gy6o8ZiLUiJCSDGDQ+6ly78+sH866Q4AVQZ6PDn0XaU2K6 WvTg== 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=Al5SKR037FpbIfHPnQpIsF4wgoIL5JGwFLMy1M47Blk=; b=POam1sbCMuxS1ugUSZgOWQKhE9PEEynik4HHu4u2u6SP97VqV/ktzxmx5c4D5RL2cs VX/qFj92wYb9xh6iJUuWoUFLLJ7aAqqMRxcXJzRlq1S+wyao3qUyb+Riu0kH+9ih+oqe c2cFq82PEMNQ2LlMVC005COkrZyr+sokkAZjodBFwovXmM9znXnIMqthf+P9rBr8R1ED /7f4P7jHCLU3VpAhAusiSoHiMSeS9N74ceOPVa419XAZKzEgqBC826uUi/LSpQRdNmSF OWi2ITN6gxa7l5QNpPFPlahcRu9qj55M9cVKFMVvsRD18COqwwi7Kpxr16nzgBs48cCn n49Q== X-Gm-Message-State: AIVw110rz5GFrPL6L6fUDndS6kpiNopvXZtTjWVcPsCohfKtk+qlrQe7 idnDKy8NhjZ2Hg== X-Received: by 10.223.154.7 with SMTP id z7mr4448777wrb.136.1501198038921; Thu, 27 Jul 2017 16:27:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jul 2017 16:27:17 -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:12 +0200 Message-Id: <20170727232612.23543-4-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 3/3] ASoC: simple-card-utils: fix unbalanced of_node_get()/of_node_put() 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/endpoint each followed by stack dump. of_graph_get_port_parent() walks through the parents looking for a node named "ports". At each step it uses of_get_next_parent() that drops the current node with of_node_put(). Avoid dropping the initial node by calling of_node_get() before of_graph_get_port_parent(). 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 1689333f8311 ("ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai()"). 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/simple-card-utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 26d64fa..144954b 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -250,6 +250,11 @@ static int asoc_simple_card_get_dai_id(struct device_node *ep) if (ret != -ENOTSUPP) return ret; + /* + * of_graph_get_port_parent() will call + * of_node_put(). So, call of_node_get() here + */ + of_node_get(ep); node = of_graph_get_port_parent(ep); /*