From: Greg Kroah-Hartman Date: Thu, 5 Sep 2019 19:06:27 +0000 (+0200) Subject: drop 4.4 and 4.9 patch X-Git-Tag: v4.4.191~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c9a797604da3048268a2e80a0ddd995b597dfa5;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.4 and 4.9 patch --- diff --git a/queue-4.4/asoc-fail-card-instantiation-if-dai-format-setup-fai.patch b/queue-4.4/asoc-fail-card-instantiation-if-dai-format-setup-fai.patch deleted file mode 100644 index 65880e43d7f..00000000000 --- a/queue-4.4/asoc-fail-card-instantiation-if-dai-format-setup-fai.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 23ef2a8aea13486004622afb1fdfd0ec8fe24d30 Mon Sep 17 00:00:00 2001 -From: Ricard Wanderlof -Date: Wed, 24 Jul 2019 11:38:44 +0200 -Subject: ASoC: Fail card instantiation if DAI format setup fails - -[ Upstream commit 40aa5383e393d72f6aa3943a4e7b1aae25a1e43b ] - -If the DAI format setup fails, there is no valid communication format -between CPU and CODEC, so fail card instantiation, rather than continue -with a card that will most likely not function properly. - -Signed-off-by: Ricard Wanderlof -Link: https://lore.kernel.org/r/alpine.DEB.2.20.1907241132350.6338@lnxricardw1.se.axis.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/soc-core.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index b927f9c81d922..8d10a24d38e06 100644 ---- a/sound/soc/soc-core.c -+++ b/sound/soc/soc-core.c -@@ -1357,8 +1357,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) - } - } - -- if (dai_link->dai_fmt) -- snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); -+ if (dai_link->dai_fmt) { -+ ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); -+ if (ret) -+ return ret; -+ } - - ret = soc_post_component_init(rtd, dai_link->name); - if (ret) --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 94532be91e3..53cb855dcc8 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -3,7 +3,6 @@ mips-kernel-only-use-i8253-clocksource-with-periodic.patch netfilter-ebtables-fix-a-memory-leak-bug-in-compat.patch bonding-force-slave-speed-check-after-link-state-rec.patch can-dev-call-netif_carrier_off-in-register_candev.patch -asoc-fail-card-instantiation-if-dai-format-setup-fai.patch st21nfca_connectivity_event_received-null-check-the-.patch st_nci_hci_connectivity_event_received-null-check-th.patch asoc-ti-davinci-mcasp-correct-slot_width-posed-const.patch diff --git a/queue-4.9/asoc-fail-card-instantiation-if-dai-format-setup-fai.patch b/queue-4.9/asoc-fail-card-instantiation-if-dai-format-setup-fai.patch deleted file mode 100644 index f75efc5739a..00000000000 --- a/queue-4.9/asoc-fail-card-instantiation-if-dai-format-setup-fai.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d3e2105c72b22011b4839e7031bf0026dfcb3f06 Mon Sep 17 00:00:00 2001 -From: Ricard Wanderlof -Date: Wed, 24 Jul 2019 11:38:44 +0200 -Subject: ASoC: Fail card instantiation if DAI format setup fails - -[ Upstream commit 40aa5383e393d72f6aa3943a4e7b1aae25a1e43b ] - -If the DAI format setup fails, there is no valid communication format -between CPU and CODEC, so fail card instantiation, rather than continue -with a card that will most likely not function properly. - -Signed-off-by: Ricard Wanderlof -Link: https://lore.kernel.org/r/alpine.DEB.2.20.1907241132350.6338@lnxricardw1.se.axis.com -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin ---- - sound/soc/soc-core.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index 168559b5e9f32..d4fb45710eec1 100644 ---- a/sound/soc/soc-core.c -+++ b/sound/soc/soc-core.c -@@ -1632,8 +1632,11 @@ static int soc_probe_link_dais(struct snd_soc_card *card, - } - } - -- if (dai_link->dai_fmt) -- snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); -+ if (dai_link->dai_fmt) { -+ ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt); -+ if (ret) -+ return ret; -+ } - - ret = soc_post_component_init(rtd, dai_link->name); - if (ret) --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index d2651db09e8..b004ceda512 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -4,7 +4,6 @@ netfilter-ebtables-fix-a-memory-leak-bug-in-compat.patch asoc-dapm-fix-handling-of-custom_stop_condition-on-d.patch bonding-force-slave-speed-check-after-link-state-rec.patch can-dev-call-netif_carrier_off-in-register_candev.patch -asoc-fail-card-instantiation-if-dai-format-setup-fai.patch st21nfca_connectivity_event_received-null-check-the-.patch st_nci_hci_connectivity_event_received-null-check-th.patch asoc-ti-davinci-mcasp-correct-slot_width-posed-const.patch