Magellan Linux

Contents of /trunk/kernel-alx/patches-5.4/0137-5.4.38-all-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3518 - (show annotations) (download)
Mon May 11 14:36:43 2020 UTC (3 years, 11 months ago) by niro
File size: 876 byte(s)
-linux-5.4.38
1 diff --git a/Makefile b/Makefile
2 index 33690285d6aa..989e7d649633 100644
3 --- a/Makefile
4 +++ b/Makefile
5 @@ -1,7 +1,7 @@
6 # SPDX-License-Identifier: GPL-2.0
7 VERSION = 5
8 PATCHLEVEL = 4
9 -SUBLEVEL = 37
10 +SUBLEVEL = 38
11 EXTRAVERSION =
12 NAME = Kleptomaniac Octopus
13
14 diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
15 index 2b04ac3d8fd3..1f698adde506 100644
16 --- a/sound/soc/meson/axg-card.c
17 +++ b/sound/soc/meson/axg-card.c
18 @@ -586,10 +586,8 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np,
19
20 if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))
21 ret = axg_card_parse_tdm(card, np, index);
22 - else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {
23 + else if (axg_card_cpu_is_codec(dai_link->cpus->of_node))
24 dai_link->params = &codec_params;
25 - dai_link->no_pcm = 0; /* link is not a DPCM BE */
26 - }
27
28 return ret;
29 }