Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3979532pxb; Tue, 25 Jan 2022 00:32:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuJbqmpA751opk8av2IhDaUOIYe+2tePKSe2TCqYu/6Rz3nHJgW2H4tm8Cz9NlU4XRWHWs X-Received: by 2002:a17:907:7f05:: with SMTP id qf5mr7823515ejc.241.1643099532063; Tue, 25 Jan 2022 00:32:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643099532; cv=none; d=google.com; s=arc-20160816; b=e3MT/Fd9VXyWq3A4ZaEnsObnqESGO9X+SevBKCRIe/4qvzy23bXkRT+Kz610sUbqHO znN+m45wQlB2+/NLQ0pix8T1DccPRT61Ly6dc6LJiUkvjfv+4qZiwD3mhsFYZ/yqYjAm vBX7O5XvLxbTvk8JwDCH0AS8lLrD/fgI9Fa8FZwLrcguVcO0Y5px8NTJkHLowFWvBgwI vtieULVWeHNfQHAmAJpkUz+Hs5wLLLUtoflGFzu0PSdsk85kIjDEx6uWLPt6/XruXQdb L1bfUhfdrtSNNBbnd45j02kmKTGABrMw0kpzeDWIpx7r2XxjbAZGEBa5HnzLFo3aNTos M3qw== 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=dLdXBkrYFNGmJ2ACqOlRvjvnn+LYNat2RSYonuXoYgg=; b=hZPHVV9wbMtXQFAFDoCAtrR+DS8YjKyhu6qiNJfbL1+U+D8h+zk1fl+fjUMSH+sLU4 jFaWQX9TKUQ0yRl/Zuu8M6aycLCxE1H6ir8fWt5q9FWTM34M5lQOVH8IJzUnMZIiiAIX ztIsq8KjyNUMiZGWogHLCHb+Y8ezRwqMRv3JvCUSSwLyNbvwY1E9MD+SfIzfnYuabs7j 2nGh/Q1z4yCyLqs34GPVKRpPgNC3Vs5bz0Evr4x7T4+eUumfTZKZnj9tMYLOradofQpA w0GhJNa+c1GP7y1EWUjI6E7qNyjbbS34H7kO0Ns9t7kDdprUTM0zsbU24nkpOiknBp27 /d0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ywPtpdH5; 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 o13si10105212edi.520.2022.01.25.00.31.47; Tue, 25 Jan 2022 00:32:12 -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=ywPtpdH5; 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 S1313699AbiAYCtO (ORCPT + 99 others); Mon, 24 Jan 2022 21:49:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358665AbiAXVDK (ORCPT ); Mon, 24 Jan 2022 16:03:10 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30996C06B58B; Mon, 24 Jan 2022 12:03:09 -0800 (PST) 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 A09C661320; Mon, 24 Jan 2022 20:03:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87D3BC340E8; Mon, 24 Jan 2022 20:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054586; bh=ZqzrJaiaGVNMXGWL+p/VujNjJlhpChX0ptTIT8Wsttc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ywPtpdH5EqgBVH0olyPKIJqfHKEo/UkGN9v+a1N+kBoe5/ow2AOeJLQMDMkjKw6Jz QabSZpEUWyKG+7QKYtOjIXJFraogTs9nbN95ZKGW/8qVHNiiDCnX1F1cU0q3/Yc5HD n2SiyNNSbcBelPvN+eCYTLnI0S6F3D7cLEOqlG+Q= 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.10 438/563] ASoC: mediatek: mt8183: fix device_node leak Date: Mon, 24 Jan 2022 19:43:23 +0100 Message-Id: <20220124184039.590688431@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@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 20d31b69a5c00..9cc0f26b08fbc 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -787,7 +787,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 79ba2f2d84522..14ce8b93597f3 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -720,7 +720,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