From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 298E0C3B189 for ; Thu, 13 Feb 2020 15:22:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E66A220848 for ; Thu, 13 Feb 2020 15:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607349; bh=r3ITya3+iLuggfTp/Cp5GzvU6us3UZStXpWPGQ4bTj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BIEE/DExHx2Vw+7aQPWtMFQhA/bVaC9uLyx8LpGkmoejZmmwLcA90cPatxooaxX4S 8I3FrTn2WPMhxKixazdfdKRvc7DvC9f2yTRtzqtMSQ+GnEFyaovk2NVWLPqrzrIx44 ml5ldGo+c1P22R9ywy9gnsCuZ79w5OMxH9HFcsqY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727933AbgBMPW1 (ORCPT ); Thu, 13 Feb 2020 10:22:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:59570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727881AbgBMPW0 (ORCPT ); Thu, 13 Feb 2020 10:22:26 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 475CC24691; Thu, 13 Feb 2020 15:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607344; bh=r3ITya3+iLuggfTp/Cp5GzvU6us3UZStXpWPGQ4bTj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F1qlIsHGhmqvB6/hgRK4mE0MbuIxC7vGKRSTQcF8/eHY4C+r/c/nxv30hmKx71zqF c78ee8wf6TcHJ9i8NFaFKq54levznBFXUyED38aAFQWfwH956xuOwhO9l7oNYjOm0a vlsRCOinFSxoS05odEh3fTgoSPQz4Q2lENTG6a1c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Patrick Lai , Banajit Goswami , Takashi Iwai , Mark Brown , Sasha Levin , Nobuhiro Iwamatsu Subject: [PATCH 4.4 04/91] ASoC: qcom: Fix of-node refcount unbalance to link->codec_of_node Date: Thu, 13 Feb 2020 07:19:21 -0800 Message-Id: <20200213151823.036410808@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151821.384445454@linuxfoundation.org> References: <20200213151821.384445454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nobuhiro Iwamatsu [ This is a fix specific to 4.4.y and 4.9.y stable trees; 4.14.y and older are not affected ] The of-node refcount fixes were made in commit 8d1667200850 ("ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()"), but not enough in 4.4.y and 4.9.y. The modification of link->codec_of_node is missing. This fixes of-node refcount unbalance to link->codec_of_node. Fixes: 8d1667200850 ("ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of()") Cc: Patrick Lai Cc: Banajit Goswami Cc: Takashi Iwai Cc: Mark Brown Cc: Sasha Levin Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Greg Kroah-Hartman --- sound/soc/qcom/apq8016_sbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index 886f2027e671..f2c71bcd06fa 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -112,7 +112,8 @@ static struct apq8016_sbc_data *apq8016_sbc_parse_of(struct snd_soc_card *card) link->codec_of_node = of_parse_phandle(codec, "sound-dai", 0); if (!link->codec_of_node) { dev_err(card->dev, "error getting codec phandle\n"); - return ERR_PTR(-EINVAL); + ret = -EINVAL; + goto error; } ret = snd_soc_of_get_dai_name(cpu, &link->cpu_dai_name); -- 2.23.0