From patchwork Fri Oct 19 12:37:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149282 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3252335lji; Fri, 19 Oct 2018 05:37:12 -0700 (PDT) X-Google-Smtp-Source: ACcGV63P4o2lJ+1M4IXVmH1jAbceMIpj+zGUJsJsD2SKuyUcDsq1BDhEKckW+drW3zQFP2j5w3H4 X-Received: by 2002:a5d:49c4:: with SMTP id t4-v6mr33214318wrs.116.1539952632776; Fri, 19 Oct 2018 05:37:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539952632; cv=none; d=google.com; s=arc-20160816; b=RGkYmlcEdTdrlPll4/iK/+eK8MaH4MDmFcZ7HOKSkJidI7aRmOJ1IQgmtPqGnjvBSV ucw4XZhIug0yJ7fgYGa8pgFB5Fpns1+HbyEjEAK9i8ibFdLA67PfztHMRVUcfjei8gkg FitOjFtcKmtoBlEPPwAyczLH44Xl2YBG2ZZOzZ8ev3Xg7k5Eb4cIJ8s+yr257BvIkok/ 1Ucz0nKOHJKhYdRCfalg1nQeslW2tysZwmSKNqgpiP43JFJxz7FRVMZy1XeTbbQiS06X 2KssZVdON8wABMZkb0pe2hAj3jlBWQVoc+exSoYTDNT7IOIFAFy4U9UeVzlgLHH9sgr7 Fj5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=yCDoSVbMA7h2ONJGGZgDgyzqoSLQWWPiRH49m06Be54=; b=mTDmJNcjtthC+RFstm/qLChd15/1Jh+MZ/EvFCAM21PKeghcbsZCHsauQSo0csWd2b 7DxFVOxvE+QU4OPz8WnOsYuZZGTDqi/dnpGNEBi0G6uczhzFSFTOpM67Lgzm9aMDVrE3 p1bcFTyq7Io4FNASvLQOCI8QovlTh247+PCVoWvhQtqSO07P8mPVBWx0+7h2+mi7kwZW gOoCat6aW/Gt+uJXWgjKd6njRrAAaAqVter0mmzyvixeKhvLjHZFtA9v9Q6YznmUslSm UM5Pe5IEfn6V9YORt4hcpMojvl9KmPKKH6hCc2Tb/bqM3Yw/icZzSEe5N0lJG7rkT2UJ feJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=g32ZoZ+8; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id o8-v6si18894985wrs.141.2018.10.19.05.37.12; Fri, 19 Oct 2018 05:37:12 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=g32ZoZ+8; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id D4D8C267971; Fri, 19 Oct 2018 14:37:06 +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 4B8A426798E; Fri, 19 Oct 2018 14:37:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id A9B42267967 for ; Fri, 19 Oct 2018 14:37:03 +0200 (CEST) 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=cLB17vnhzSv1wbGiqjcSEnFib4jdfkWIQyTvQf+N+d8=; b=g32ZoZ+8NIuq N1VyUL9xaGDpJjpDNXhnX6kwhPdtZz8jswYwMqGarIR4arLZ8UHWu92CmC0fEpS9Ftgv/G9lmigdZ w/v3ZMrpy7KfQk7XlbdN0hunLqx8UZiwpKQ9sPERlXa6av9bF8anUmrH0dNo68J364eTa9h6atO7c 8REiM=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gDU1X-00008f-BX; Fri, 19 Oct 2018 12:37:03 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 0D27F1122548; Fri, 19 Oct 2018 13:37:03 +0100 (BST) From: Mark Brown To: Marcel Ziswiler In-Reply-To: Message-Id: <20181019123703.0D27F1122548@debutante.sirena.org.uk> Date: Fri, 19 Oct 2018 13:37:03 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown , Jon Hunter Subject: [alsa-devel] Applied "ASoC: tegra_sgtl5000: fix device_node refcounting" to the asoc tree 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 The patch ASoC: tegra_sgtl5000: fix device_node refcounting 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 a85227da2dcc291b762c8482a505bc7d0d2d4b07 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 16 Oct 2018 12:47:29 +0200 Subject: [PATCH] ASoC: tegra_sgtl5000: fix device_node refcounting Similar to the following: commit 4321723648b0 ("ASoC: tegra_alc5632: fix device_node refcounting") commit 7c5dfd549617 ("ASoC: tegra: fix device_node refcounting") Signed-off-by: Marcel Ziswiler Acked-by: Jon Hunter Signed-off-by: Mark Brown --- sound/soc/tegra/tegra_sgtl5000.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c index 45a4aa9d2a47..901457da25ec 100644 --- a/sound/soc/tegra/tegra_sgtl5000.c +++ b/sound/soc/tegra/tegra_sgtl5000.c @@ -149,14 +149,14 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Property 'nvidia,i2s-controller' missing/invalid\n"); ret = -EINVAL; - goto err; + goto err_put_codec_of_node; } tegra_sgtl5000_dai.platform_of_node = tegra_sgtl5000_dai.cpu_of_node; ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); if (ret) - goto err; + goto err_put_cpu_of_node; ret = snd_soc_register_card(card); if (ret) { @@ -169,6 +169,13 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev) err_fini_utils: tegra_asoc_utils_fini(&machine->util_data); +err_put_cpu_of_node: + of_node_put(tegra_sgtl5000_dai.cpu_of_node); + tegra_sgtl5000_dai.cpu_of_node = NULL; + tegra_sgtl5000_dai.platform_of_node = NULL; +err_put_codec_of_node: + of_node_put(tegra_sgtl5000_dai.codec_of_node); + tegra_sgtl5000_dai.codec_of_node = NULL; err: return ret; } @@ -183,6 +190,12 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev) tegra_asoc_utils_fini(&machine->util_data); + of_node_put(tegra_sgtl5000_dai.cpu_of_node); + tegra_sgtl5000_dai.cpu_of_node = NULL; + tegra_sgtl5000_dai.platform_of_node = NULL; + of_node_put(tegra_sgtl5000_dai.codec_of_node); + tegra_sgtl5000_dai.codec_of_node = NULL; + return ret; }