From patchwork Fri Oct 19 12:29:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149269 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3243757lji; Fri, 19 Oct 2018 05:29:28 -0700 (PDT) X-Google-Smtp-Source: ACcGV62sg56z9wFBbMWn68kyXaEMMvuXdrB92WCtLOXo0tk5mq431pqkLCEWOlk6S9lYB5KIBpvI X-Received: by 2002:a1c:868e:: with SMTP id i136-v6mr4757599wmd.50.1539952168461; Fri, 19 Oct 2018 05:29:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539952168; cv=none; d=google.com; s=arc-20160816; b=TEa1+2bGig7HM5XNa4BYALhnbFU14nrPOzaBsqLjBZCzLzPtQ3EGUpBsOrEjpD79vu Wi3Gduqx1a18SoyhMViHW2FMTV32FwePie2H/O536GTkkFVXPDq2kTYn5aExFixsaxVb EdeyYZ6+opnggboo/6IJlhMqZ6lsHFbPyvdWy/Fa8v7kw4fxjPqFSQt+TB5mDQAUy1He vWUAsCs7iOT55lP6rsRdz0alz5nXnllerLDOh9Ce5YhKMaGMGjmU3S/zBoPOfo6tFiS1 rMhZIflaVZ5V7P9F1BncO9YU2ifcDm4IbDsEH9nKR8Tskt3tv7vmlRTo8j5A42FeFo9a Gv2w== 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=N1TDjD8R8/BS51fmoqD7LG/JqzMFJI+xqVghttYBnAQttvoYjG6c8I5wMuNge+pdjM 8vMnXGgQwYwlS97/gVuMpgzgE0Szv2T7c1BZjLSh+oa2E1fGLEQ5le1GoQQl3ilaPgrT 04mc7yEStGyOsWUO/i4R4PWMWNVq4/t/GaBhiQBnhzxL1zsKMl0+SdHAMkowmHCVCCc/ uwTp8UN9941Q9bxL4d0D3zPJc8z2K7pkwLIf2hvG0b4ydugKh9gr0Ooc9xDshhJOMy8N 1eDXAJ6982lMieRiJtrWvh9RkeR69Ikb30cTJ0KGB+K6nLW81lWHhzHNZ4Z1wOgpykIx dsYw== 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=BW3YIi12; 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 c126-v6si2565771wme.65.2018.10.19.05.29.28; Fri, 19 Oct 2018 05:29:28 -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=BW3YIi12; 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 2C09526796C; Fri, 19 Oct 2018 14:29:27 +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 60F5426798A; Fri, 19 Oct 2018 14:29:24 +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 A8E66267950 for ; Fri, 19 Oct 2018 14:29:22 +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=BW3YIi12/qVf u6Fp7maBc8FonTxknDXSlx8mMfEwg6B9IYrbztqVHvW2oa/30dO66TUgJHSDbG6JJ2QYzERcMsgKf XuIvWDfEXaJ1xS500+M6tE8vFN3D+5qQhxmiw22y5X7oXz/PCMTZ7sxmuj02MhPuXU2fth/Ik3Oy+ Xrmks=; 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 1gDTu5-0008W7-Uu; Fri, 19 Oct 2018 12:29:21 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id AF7571122548; Fri, 19 Oct 2018 13:29:21 +0100 (BST) From: Mark Brown To: Marcel Ziswiler In-Reply-To: Message-Id: <20181019122921.AF7571122548@debutante.sirena.org.uk> Date: Fri, 19 Oct 2018 13:29:21 +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; }