From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 5 Sep 2019 18:56:19 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.191~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b8dcf0a9a77c472e74be6ac1cf782879acc3dfa;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	revert-asoc-fail-card-instantiation-if-dai-format-setup.patch
---

diff --git a/queue-4.14/revert-asoc-fail-card-instantiation-if-dai-format-setup.patch b/queue-4.14/revert-asoc-fail-card-instantiation-if-dai-format-setup.patch
new file mode 100644
index 00000000000..4287f9a15ad
--- /dev/null
+++ b/queue-4.14/revert-asoc-fail-card-instantiation-if-dai-format-setup.patch
@@ -0,0 +1,41 @@
+From 8b93e26919ff2f7e9505ba0c599830f2d14db3f6 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 5 Sep 2019 20:48:46 +0200
+Subject: Revert "ASoC: Fail card instantiation if DAI format setup fails"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit a56c79efe4dc8ae560eb2c9a4b755d57c8c2e8f4 which is
+commit 40aa5383e393d72f6aa3943a4e7b1aae25a1e43b upstream.
+
+Mark Brown writes:
+	I nacked this patch when Sasha posted it - it only improves
+	diagnostics and might make systems that worked by accident break
+	since it turns things into a hard failure, it won't make
+	anything that didn't work previously work.
+
+Reported-by: Mark Brown <broonie@kernel.org>
+Cc: Ricard Wanderlof <ricardw@axis.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Link: https://lore.kernel.org/lkml/20190904181027.GG4348@sirena.co.uk
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/soc-core.c |    7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- a/sound/soc/soc-core.c
++++ b/sound/soc/soc-core.c
+@@ -1757,11 +1757,8 @@ static int soc_probe_link_dais(struct sn
+ 		}
+ 	}
+ 
+-	if (dai_link->dai_fmt) {
+-		ret = snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
+-		if (ret)
+-			return ret;
+-	}
++	if (dai_link->dai_fmt)
++		snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);
+ 
+ 	ret = soc_post_component_init(rtd, dai_link->name);
+ 	if (ret)
diff --git a/queue-4.14/series b/queue-4.14/series
index 4b6aab3a6a8..e05fc3dbe70 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -55,3 +55,4 @@ nfs-pass-error-information-to-the-pgio-error-cleanup.patch
 nfs-ensure-o_direct-reports-an-error-if-the-bytes-re.patch
 i2c-piix4-fix-port-selection-for-amd-family-16h-mode.patch
 x86-ptrace-fix-up-botched-merge-of-spectrev1-fix.patch
+revert-asoc-fail-card-instantiation-if-dai-format-setup.patch