[gentoo-commits] proj/linux-patches:5.4 commit in: /

[Mike Pagano]

commit:     5ab7e7f6ccca46d47ce7246f8086bc385244315a
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sat May  2 19:24:33 2020 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sat May  2 19:24:33 2020 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=5ab7e7f6

Linux patch 5.4.38

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README             |  4 ++++
 1037_linux-5.4.38.patch | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/0000_README b/0000_README
index 0cb47e8..8f9e369 100644
--- a/0000_README
+++ b/0000_README
@@ -191,6 +191,10 @@ Patch:  1036_linux-5.4.37.patch
 From:   http://www.kernel.org
 Desc:   Linux 5.4.37
 
+Patch:  1037_linux-5.4.38.patch
+From:   http://www.kernel.org
+Desc:   Linux 5.4.38
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1037_linux-5.4.38.patch b/1037_linux-5.4.38.patch
new file mode 100644
index 0000000..2bd282e
--- /dev/null
+++ b/1037_linux-5.4.38.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile b/Makefile
+index 33690285d6aa..989e7d649633 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 5
+ PATCHLEVEL = 4
+-SUBLEVEL = 37
++SUBLEVEL = 38
+ EXTRAVERSION =
+ NAME = Kleptomaniac Octopus
+ 
+diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
+index 2b04ac3d8fd3..1f698adde506 100644
+--- a/sound/soc/meson/axg-card.c
++++ b/sound/soc/meson/axg-card.c
+@@ -586,10 +586,8 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,
+ 
+ 	if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
+ 		ret = axg_card_parse_tdm(card, np, index);
+-	else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {
++	else if (axg_card_cpu_is_codec(dai_link->cpus->of_node))
+ 		dai_link->params = &codec_params;
+-		dai_link->no_pcm = 0; /* link is not a DPCM BE */
+-	}
+ 
+ 	return ret;
+ }