Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3653287pxb; Mon, 24 Jan 2022 14:31:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQCKi9Licn+LTpSzbswCUQrkonWVZX754pcdDOidtmU9/6YPp8jLDztxiEiyUNFUbo/jPG X-Received: by 2002:a17:902:e550:b0:14b:6dc8:b2f4 with SMTP id n16-20020a170902e55000b0014b6dc8b2f4mr1649473plf.56.1643063466514; Mon, 24 Jan 2022 14:31:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643063466; cv=none; d=google.com; s=arc-20160816; b=BMQpHQ2T8fGjKjzNl6YE7ThnRYYNXQEmuKThDGzztSFdRLjWjh2mwHvLChzt0o0No/ LPchN1wn7o29+v+HqQotCdWNRMRxoyMZ/x5hu3P0Mel6a88LfVQtoGnffPASUqiQhhKp IQKqKeyTaNVoJm15yBWaE9XBuXhyXE1ImRoqSJAhD+I+vL/SivuzcjxCOWjXg4mQ0WNy Hgo+0l7ix+uXRAzhRMAOHZXPITrKEqRj84cgRVTvb+DYSW7LInNmDzFlRRRhpC24oN8R cN6tQWnZ00s8j1nYus+jDs9/WBeHOAzvVbyOgDtoT/rOe9WF+i3lYf3eIcmKJA1VcfCT 0vUQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tefXUJoo+M6BfV4iZP8Ei/SdMZSOBbd6BtU6eodP9gU=; b=Ro2XlORVUkBa5S6OjbF0Ge5p43AlcIdgNi9e6CjdV3Kqp13iB4J31/h8+j5DF0aC5p 5AR6B5YtbsK33hP4COJ1hIo+tHTBvHeB67/Xq+6uR78xvrZiSexhzZUs4+3AiRdkMzVC HPQ+9vjwDUwzJvjoHaSk73fg8YOTYZgtcqVAng/Fa98vvSaWe8Cs4VfU/WKQBv5A462t 42AbvcGcRhsFUBXPEiTrkhtcB3P3WQf5E9mYGrEbiPI/INQ9epj+VQ4VG64j11LCeK9J 3i7aVtrwZ2ecB0azx7KQcrx0kTEDMcrNRFtgWWq17c35rKwjL2H1qu60gjXWlTWwvs9t evvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=K10IUhma; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h14si16355291pfc.358.2022.01.24.14.30.54; Mon, 24 Jan 2022 14:31:06 -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=@linuxfoundation.org header.s=korg header.b=K10IUhma; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1584303AbiAXWUj (ORCPT + 99 others); Mon, 24 Jan 2022 17:20:39 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:52186 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1454132AbiAXVbu (ORCPT ); Mon, 24 Jan 2022 16:31:50 -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 1933D61320; Mon, 24 Jan 2022 21:31:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A4FDC340E7; Mon, 24 Jan 2022 21:31:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643059909; bh=grTelnkSX6Y12cAJ2c2Z7iI+CF/lO3oFNnwSui4aYhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K10IUhma7e0Dilj+4D0vmFGEn/PJMFuESy31obxEicyklYfm5E4mvtKNpiYpnc4L8 fiSHu24nNLADyxodk4WhTPLFc5+FagtXmbY1gkV+ZsOJzsAV12XMyu9BQjjS2V8eUt xyy+r9c39Cp3rUWNFDVW2NV2Fd6+pZMNO0aN/iOA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tzung-Bi Shih , Mark Brown , Sasha Levin Subject: [PATCH 5.16 0776/1039] ASoC: mediatek: mt8183: fix device_node leak Date: Mon, 24 Jan 2022 19:42:45 +0100 Message-Id: <20220124184151.377915660@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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