Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3366195pxb; Mon, 17 Jan 2022 18:43:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmtFZJ9PghTBPJvDGfVCYiqViLR2f2dTkrzNxpOuvOSHtX9RJIqOJ54Wc9Ny21n9A2639+ X-Received: by 2002:a17:902:bc41:b0:14a:922c:d5a with SMTP id t1-20020a170902bc4100b0014a922c0d5amr17579160plz.93.1642473838611; Mon, 17 Jan 2022 18:43:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642473838; cv=none; d=google.com; s=arc-20160816; b=g45nzaTDcNIjisnCyzENjCt1vBdU1IdZlpMjbOqsBvtJDaNObvYfQaLWcFXh4xTDUc /aTkVi2Y4eE7N8zZaPDo27sN4XDASb7l6DuTsZHXXL3I7XfAZdUN9LbmmTA0eWueExHL slfQqToLuq3KU7CUuOXF1H98uVMZcZsAbuvRQehC4MOtASgiYgAYRJ0YXVLksHOFPTfc 3W4jqgxqid8QmzcJ2dIhdfeeT/eyx6QcHzTtyP8W0xs/poZP5c4dK6CYbvWviwMrkomm np9Q/WHS64eKvdD4JpQwDlBTK15Sp3ZYzYzkKfIZZQ8njVMmJY1ieEL4QylZ9r9gM34b IdMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tefXUJoo+M6BfV4iZP8Ei/SdMZSOBbd6BtU6eodP9gU=; b=azmIiJuHXXJev9jS433jUYhtskW8YuhXby9no52ldAd1n7aTlPlyACpRJyfMG2GcrA MXErSIGGkKWwzy/caAdpDo8UCy8xSVJ9RE23MdZsjuHqPIlaTvbRL4W4OU7cpS2phPnX 3yIwTGfdZ6iznTWsmSd5snGtTH1T0puTPSmM3TcY/6h2/0I55yUnWve9FhJNC0kl3j2+ XJpjBz4miD7EoXL2SPvpWyLxhgfVk4ZenTEriVJrCgZdGUawTk/5f7ib3VyrL2VDk766 CygascBxDgJIavEb/jNOpLnkHKy855fIzaOd22EtSHAAJsGDwTfJj92ndNKPFXonQG5i 49ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FAwRg9Fj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lb10si1279045pjb.74.2022.01.17.18.43.47; Mon, 17 Jan 2022 18:43:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FAwRg9Fj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242046AbiAQRCP (ORCPT + 99 others); Mon, 17 Jan 2022 12:02:15 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:50724 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241428AbiAQRBD (ORCPT ); Mon, 17 Jan 2022 12:01:03 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8A42A611B9; Mon, 17 Jan 2022 17:01:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EBA2C36AE3; Mon, 17 Jan 2022 17:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642438863; bh=grTelnkSX6Y12cAJ2c2Z7iI+CF/lO3oFNnwSui4aYhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FAwRg9FjhEZO6YeRXgFcKaOLTmqRwTe94xPkcObvK8OLJ22fjhIJCqCYTKBMAs2Dk 3zKNQ6ZxCf/kTRzSYDD3RNaf2i1Vdl/tERgqkH2JNLK/y4eL8DKK46D6OwoMkDpfjV aq45jBkRb5piZfENjohw1zLQzWINAPy3p0lx35qF6V+RDwK8SOgKR6q8qwB8s8Q81K HqsraVngMF2o8C+6d7K9dhGRAvUH+nLbGSDuYIa3Kb3cfaaHo5Zuu1FBNpk/hhWeQJ FGRylGb8w5lJ3QtJjrVO0036MRQgu8NmDGPy8gFEgT16qsmF5F2Nfi0qvgeZ59ewWC hrCc3etzubmVg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tzung-Bi Shih , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, matthias.bgg@gmail.com, jiaxin.yu@mediatek.com, rikard.falkeborn@gmail.com, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.16 46/52] ASoC: mediatek: mt8183: fix device_node leak Date: Mon, 17 Jan 2022 11:58:47 -0500 Message-Id: <20220117165853.1470420-46-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117165853.1470420-1-sashal@kernel.org> References: <20220117165853.1470420-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tzung-Bi Shih [ Upstream commit cb006006fe6221f092fadaffd3f219288304c9ad ] Fixes the device_node leak. Signed-off-by: Tzung-Bi Shih Link: https://lore.kernel.org/r/20211224064719.2031210-3-tzungbi@google.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 +++++- sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index a4d26a6fc8492..bda103211e0bd 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -781,7 +781,11 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) return ret; } - return devm_snd_soc_register_card(&pdev->dev, card); + ret = devm_snd_soc_register_card(&pdev->dev, card); + + of_node_put(platform_node); + of_node_put(hdmi_codec); + return ret; } #ifdef CONFIG_OF diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index aeb1af86047ef..9f0bf15fe465e 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -780,7 +780,12 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) __func__, ret); } - return devm_snd_soc_register_card(&pdev->dev, card); + ret = devm_snd_soc_register_card(&pdev->dev, card); + + of_node_put(platform_node); + of_node_put(ec_codec); + of_node_put(hdmi_codec); + return ret; } #ifdef CONFIG_OF -- 2.34.1