This is the 5.4.38 stable release

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl6tkToACgkQONu9yGCS
 aT7C9g/9H71MvscqXGt6tpZ5Oh+oYdIqwDdo7SSYK1C99D0pTWF2eVOGshVrXz3l
 V9z8Mz7MC7F2GX968eHD274HA8TRkJNfuQoayBh0fsOUmeMdu1PqHPQgR9DZjqdv
 qkGQeTxMEWuiRzkErK3lLoDQTuAocsFxgGB2z1XKF2XsMZeW+of31oX8Fwxfxf4a
 ELulKH7SSDkSTJDYORW0IVw+c8+Y1R5q7Im+r6h2p/+GRtFtDzVkl5Kh8gqtwcgX
 F1wUDjiZOMNKTQfVHau021a7401rM6Yw8EDyTf8lrfGUNzddOkWyXekzJeouYUo8
 CpK5YSz0HyHAFxn23cC4sradnsbZQRBoN2TYkSkLflIaEHM9z5stw0J5k9KPNtlk
 8X4JL3CVqPg5bESQOnCvTbk0jHbe4Nd6ZC+TCsj0+Jyx8O9JdwyawzOmx0rnow1a
 xhTwjnpXc3uNMK2QlGsS3v8RNi5oCb+rOkGCRdA+nXZz3HE/y19KQOFAH44WIiyQ
 Nzr0qpQBswdIEYDK1PaR/8Jkic3OHlErFWtQnQlyWZl9YZjexkjK4+pQVC9gUYCD
 UvPnTpIu83YM8S/IuuMHvG1YNnmegIUqqYX4Wv4IJhxagJpI5zAy21BVjowKz+GN
 /et8mbhtFfuJG6OwHFoXyd12+XSYLfO3QghyryTU74tpgVzUA6U=
 =kVhp
 -----END PGP SIGNATURE-----

Merge 5.4.38 into android-5.4-stable

Changes in 5.4.38
	Revert "ASoC: meson: axg-card: fix codec-to-codec link setup"
	Linux 5.4.38

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8092291790f9b3a2a6e7bba87dc3c50eaa9d23cc
This commit is contained in:
Greg Kroah-Hartman 2020-05-02 17:41:29 +02:00
commit 4fd5adaa35
2 changed files with 2 additions and 4 deletions

View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 4
SUBLEVEL = 37
SUBLEVEL = 38
EXTRAVERSION =
NAME = Kleptomaniac Octopus

View file

@ -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;
}