From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752543AbdKMLNI (ORCPT ); Mon, 13 Nov 2017 06:13:08 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:46844 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752179AbdKMLNE (ORCPT ); Mon, 13 Nov 2017 06:13:04 -0500 X-Google-Smtp-Source: AGs4zMZTnR6xgNboJdPAkoOFATN8nZP3LJQTs9Uq/8SBxMX5zIghWn5eUt95wHwOvh6Yek1OjNLqNg== From: Johan Hovold To: Mark Brown Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Peter Ujfalusi , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 2/2] ASoC: twl4030: fix child-node lookup Date: Mon, 13 Nov 2017 12:12:56 +0100 Message-Id: <20171113111256.24140-2-johan@kernel.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171113111256.24140-1-johan@kernel.org> References: <20171113111256.24140-1-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix child-node lookup during probe, which ended up searching the whole device tree depth-first starting at the parent rather than just matching on its children. To make things worse, the parent codec node was also prematurely freed, while the child node was leaked. Fixes: 2d6d649a2e0f ("ASoC: twl4030: Support for DT booted kernel") Cc: stable # 3.7 Cc: Peter Ujfalusi Signed-off-by: Johan Hovold --- sound/soc/codecs/twl4030.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index c482b2e7a7d2..cfe72b9d4356 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -232,7 +232,7 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); struct device_node *twl4030_codec_node = NULL; - twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node, + twl4030_codec_node = of_get_child_by_name(codec->dev->parent->of_node, "codec"); if (!pdata && twl4030_codec_node) { @@ -241,9 +241,11 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) GFP_KERNEL); if (!pdata) { dev_err(codec->dev, "Can not allocate memory\n"); + of_node_put(twl4030_codec_node); return NULL; } twl4030_setup_pdata_of(pdata, twl4030_codec_node); + of_node_put(twl4030_codec_node); } return pdata; -- 2.15.0