[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20200504102419.GB1461414@kroah.com>
Date: Mon, 4 May 2020 12:24:19 +0200
From: Greg KH <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org,
Andrew Morton <akpm@...ux-foundation.org>,
torvalds@...ux-foundation.org, stable@...r.kernel.org
Cc: lwn@....net, Jiri Slaby <jslaby@...e.cz>
Subject: Re: Linux 5.6.10
diff --git a/Makefile b/Makefile
index 2fc8ba07d930..4b29cc9769e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 6
-SUBLEVEL = 9
+SUBLEVEL = 10
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;
}
Powered by blists - more mailing lists