4.14-stable patches

added patches:
	asoc-qcom-fix-of-node-refcount-unbalance-to-link-codec_of_node.patch

diff --git a/queue-4.14/asoc-qcom-fix-of-node-refcount-unbalance-to-link-codec_of_node.patch b/queue-4.14/asoc-qcom-fix-of-node-refcount-unbalance-to-link-codec_of_node.patch
new file mode 100644 (file)
index 0000000..27c8dbc
--- /dev/null
+++ b/queue-4.14/asoc-qcom-fix-of-node-refcount-unbalance-to-link-codec_of_node.patch
@@ -0,0 +1,46 @@
+From nobuhiro1.iwamatsu@toshiba.co.jp  Thu Feb  6 07:00:30 2020
+From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Date: Thu,  6 Feb 2020 12:36:11 +0900
+Subject: ASoC: qcom: Fix of-node refcount unbalance to link->codec_of_node
+To: stable@vger.kernel.org
+Message-ID: <20200206033611.10593-1-nobuhiro1.iwamatsu@toshiba.co.jp>
+
+From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+
+[ 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 <plai@codeaurora.org>
+Cc: Banajit Goswami <bgoswami@codeaurora.org>
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: Mark Brown <broonie@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 2de81b89267414ea8a4be7667ed32072dc8951d8..511d839093a880b4b155bc302c05d0a6ccbff90d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -3,3 +3,4 @@ media-iguanair-fix-endpoint-sanity-check.patch
 x86-cpu-update-cached-hle-state-on-write-to-tsx_ctrl.patch
 iwlwifi-mvm-fix-nvm-check-for-3168-devices.patch
 sparc32-fix-struct-ipc64_perm-type-definition.patch
+asoc-qcom-fix-of-node-refcount-unbalance-to-link-codec_of_node.patch