From patchwork Thu Jul 27 23:26:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Borneo X-Patchwork-Id: 9867689 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 E9C9C601A1 for ; Thu, 27 Jul 2017 23:27:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD0C728865 for ; Thu, 27 Jul 2017 23:27:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1F662886C; Thu, 27 Jul 2017 23:27:33 +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 10E4A28865 for ; Thu, 27 Jul 2017 23:27:33 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4DBED267616; Fri, 28 Jul 2017 01:27:23 +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 040FE267615; Fri, 28 Jul 2017 01:27:22 +0200 (CEST) Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by alsa0.perex.cz (Postfix) with ESMTP id 45D0426760D for ; Fri, 28 Jul 2017 01:27:15 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id y67so24575191wrb.3 for ; Thu, 27 Jul 2017 16:27:15 -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=U2vmu3zGc1ml8YBwBvlUHjWh84zQHskE6Yg6+0rPRuY=; b=Sr4QPxK+hpqo4rxXrsFJPVhpf5+g7Frf4eYqsNhsXbpsjImoFPHWl4EKn452JhSNJ9 GPfiCiaZxH6OVLPrm1zBF6ElT4lLGOIeTcLgEANdoXcEG7MhAU4QmYZE7+p10gioKg5U wtFHUjV+51kuQXy0YCrB+j1/J6x6wSlSSzqNnk+UC4JpOJtKNPMBIQAgoMKWe4VypRE6 8P0m/vnbI/uipO7IIHrP4uYjnQIjevDcyyAvhOxF57BH8rlAQwo7T3IhtL58yaNqn0/r s1RszoalEtuJnMmakeohtLBQxRioWTSveEOq92scXkRPYGkGWskBTOZLI8gzkAxhbqE1 Vfww== 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=U2vmu3zGc1ml8YBwBvlUHjWh84zQHskE6Yg6+0rPRuY=; b=kQ4lHVtgEHAfq35Hxj0SwVA8ZwF1XJhNRTFz26rDMQkJMpvR1u0hL2HWKbcgCo9rVS qpPtGkdOHEJIM6Bhml9erqrdImu8Vl86iEPW2ti7FMs4xEPVIq9WowSV8AZ5W7z574vl bSlSFwWxXvsKxhtamCOislWQyREyV+IoWmXvfHg2pssr/aFDD/d/u+hbFEmZOz/MlgD0 5yNRfNXS0X7rKI/zVEuVeSUEOy8UPlAxE02wNc7Hu8KJSyTQ80abQuIEJ6XuwT1PCjKV m611TniWJIIz2/kwFYFDg5Iy5pyBE/6E+13YLSkpOfx/CRcMHMHZ6powXxJFTkA92pBM oA8A== X-Gm-Message-State: AIVw112zzFI6EwENSbnVk/1dljmL4t6lhQY5/NZqtx2uP+W0wmUwuy5k uGiBUAQ+ZhDY3A== X-Received: by 10.223.169.41 with SMTP id u38mr4954098wrc.286.1501198035493; Thu, 27 Jul 2017 16:27:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jul 2017 16:27:14 -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:11 +0200 Message-Id: <20170727232612.23543-3-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 2/3] ASoC: soc-core: 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 a180e8b98843 ("ASoC: add snd_soc_get_dai_id() function"). 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/soc-core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 921622a..a0f39de 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4087,6 +4087,11 @@ int snd_soc_get_dai_id(struct device_node *ep) struct device_node *node; int 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); /*