From patchwork Wed Jan 31 10:42:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10193883 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 F3F8D60380 for ; Wed, 31 Jan 2018 10:42:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B2D7283CB for ; Wed, 31 Jan 2018 10:42:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FEF42842E; Wed, 31 Jan 2018 10:42:59 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7D8E4283CB for ; Wed, 31 Jan 2018 10:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=apCQfrpg2pO/MWtye4V7g6+/aOKWXUiYH/t8cdsuIyQ=; b=SoP xC5N1qXRlTQOxWFMKLcenr6bQ6Md6WSqPCp9kh99eVvN7hHKWLx/PyYadIHmTBHvAsb3IBZJK2oeR HhjA8z6GjF0ViTtiCdWSN9Uk37/XHar0lrySrj972SMqDqcozerDuKwbSiFzNty1xxihJ1sLaof24 3NkF4MGvpcFpNJE1b99zlpVxW1S6gWyxzaJC/MTlkf7JPo2BQmhZ+3W45QJz4BpcMZFsANvr34Rs9 lUEH2Bz7x36V8m2pBRup8ySByWPNRhUKGihG6uthW5DHPlWxyeceqIzGItVpYbvfpCbDKVDLLP3Vt bneZwwGjUsL7lC3LCHQSxgRwnaEIMnA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1egpqy-0003ud-Cc; Wed, 31 Jan 2018 10:42:56 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1egpqw-0003uU-SD for linux-mediatek@bombadil.infradead.org; Wed, 31 Jan 2018 10:42:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=FscCwm5ol274k8DkrEkO8MeOCHAXN6SBTeuCC0PCqH0=; b=tHOIRt2RLoxo+jcDD0rAIaycAh rL8Ys8OIJzoKdfQcdjh3AMoQHJL7OniEtjssrmrWO3vxCTPh/n82anmbq2Pm0EDMJm4w4SOHKRFOu SQUNLqHL5VO0ifIBV1q36vsvWizpWcEln43s60CfMXi83fx4TTvOx4O6/ZGu0phABaNlEzRYAeQ6K 0yZCnhzySqYMfJFROnh9l91I5jSuUKTOqMAVMF03eQ0sA+3BY3XUJ+nmZGbmCE8rNM01KLeuX2B7u SLBm+UtYirhyfwtkqdvd4siCuqkVFSszU/EPAVtKeds9QrJ+aP5N8b0PYHkSinfFVTfUNoLlSUqr/ W9bwiLRQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1egpqt-000585-EV for linux-mediatek@lists.infradead.org; Wed, 31 Jan 2018 10:42:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=FscCwm5ol274k8DkrEkO8MeOCHAXN6SBTeuCC0PCqH0=; b=Sh4DTN74x699 MWYyAGSaCQ95IxJbqGjiEkQb1GE09k1zyNo4aUB+xBlL6qn4TSx2GcCKt/alHZ0XI1wHbwNUMCIHv hISvGask1P7oxWmYcYN58jlzBDSvRoAdCCRZ0rz++cBoUfkbnTXRtbWtSYOkfKvrDyAzXGR+22Lqi lm0rk=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1egpq7-0006JR-1H; Wed, 31 Jan 2018 10:42:03 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1egpq6-0002zx-4O; Wed, 31 Jan 2018 10:42:02 +0000 From: Mark Brown To: Johan Hovold Subject: Applied "ASoC: mt8173-rt5650: fix child-node lookup" to the asoc tree In-Reply-To: <20180131055921.25574-1-johan@kernel.org> Message-Id: Date: Wed, 31 Jan 2018 10:42:02 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180131_104251_500542_3930B954 X-CRM114-Status: GOOD ( 20.98 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Liam Girdwood , Mark Brown , linux-mediatek@lists.infradead.org, PC Liao , Matthias Brugger MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: mt8173-rt5650: fix child-node lookup has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 06190937b9de9803e15a122762b5bbd442eaee31 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 31 Jan 2018 16:59:21 +1100 Subject: [PATCH] ASoC: mt8173-rt5650: fix child-node lookup This driver used the wrong OF-helper when looking up the optional capture-codec child node during probe. Instead of searching just children of the sound node, a tree-wide depth-first search starting at the unrelated platform node was done. Not only could this end up matching an unrelated node or no node at all; the platform node could also be prematurely freed since of_find_node_by_name() drops a reference to its first argument. This particular pattern has been observed leading to crashes after probe deferrals in other drivers. Fix this by dropping the broken call to of_find_node_by_name() and keeping only the second, correct lookup using of_get_child_by_name() while taking care not to bail out if the optional node is missing. Note that this also addresses two capture-codec node-reference leaks (one for each of the original helper calls). Compile tested only. Fixes: d349caeb0510 ("ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver") Signed-off-by: Johan Hovold Signed-off-by: Mark Brown --- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index 40ebefd625c1..679fc8bea0a3 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -272,15 +272,10 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) } mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node; - if (of_find_node_by_name(platform_node, "codec-capture")) { - np = of_get_child_by_name(pdev->dev.of_node, "codec-capture"); - if (!np) { - dev_err(&pdev->dev, - "%s: Can't find codec-capture DT node\n", - __func__); - return -EINVAL; - } + np = of_get_child_by_name(pdev->dev.of_node, "codec-capture"); + if (np) { ret = snd_soc_of_get_dai_name(np, &codec_capture_dai); + of_node_put(np); if (ret < 0) { dev_err(&pdev->dev, "%s codec_capture_dai name fail %d\n",