Linux v5.4.18
This commit is contained in:
parent
7c1497902b
commit
379565782f
3 changed files with 5 additions and 65 deletions
|
|
@ -1,60 +0,0 @@
|
|||
From 29bc8978342b2d94a65801904c44dc7b0ef88da2 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Wed, 22 Jan 2020 20:07:52 +0100
|
||||
Subject: [PATCH] ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj
|
||||
initialization order
|
||||
|
||||
The code which checks the return value for snd_soc_add_dai_link() call
|
||||
in soc_tplg_fe_link_create() moved the snd_soc_add_dai_link() call before
|
||||
link->dobj members initialization.
|
||||
|
||||
While it does not affect the latest kernels, the old soc-core.c code
|
||||
in the stable kernels is affected. The snd_soc_add_dai_link() function uses
|
||||
the link->dobj.type member to check, if the link structure is valid.
|
||||
|
||||
Reorder the link->dobj initialization to make things work again.
|
||||
It's harmless for the recent code (and the structure should be properly
|
||||
initialized before other calls anyway).
|
||||
|
||||
The problem is in stable linux-5.4.y since version 5.4.11 when the
|
||||
upstream commit 76d270364932 was applied.
|
||||
|
||||
Fixes: 76d270364932 ("ASoC: topology: Check return value for snd_soc_add_dai_link()")
|
||||
Cc: Dragos Tarcatu <dragos_tarcatu@mentor.com>
|
||||
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
|
||||
Cc: Mark Brown <broonie@kernel.org>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
sound/soc/soc-topology.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
|
||||
index fd2d22ddc81b..1c143a00633f 100644
|
||||
--- a/sound/soc/soc-topology.c
|
||||
+++ b/sound/soc/soc-topology.c
|
||||
@@ -1891,6 +1891,10 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
|
||||
link->num_codecs = 1;
|
||||
link->num_platforms = 1;
|
||||
|
||||
+ link->dobj.index = tplg->index;
|
||||
+ link->dobj.ops = tplg->ops;
|
||||
+ link->dobj.type = SND_SOC_DOBJ_DAI_LINK;
|
||||
+
|
||||
if (strlen(pcm->pcm_name)) {
|
||||
link->name = kstrdup(pcm->pcm_name, GFP_KERNEL);
|
||||
link->stream_name = kstrdup(pcm->pcm_name, GFP_KERNEL);
|
||||
@@ -1927,9 +1931,6 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
|
||||
goto err;
|
||||
}
|
||||
|
||||
- link->dobj.index = tplg->index;
|
||||
- link->dobj.ops = tplg->ops;
|
||||
- link->dobj.type = SND_SOC_DOBJ_DAI_LINK;
|
||||
list_add(&link->dobj.list, &tplg->comp->dobj_list);
|
||||
|
||||
return 0;
|
||||
--
|
||||
2.24.1
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 17
|
||||
%define stable_update 18
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -564,9 +564,6 @@ Patch527: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch
|
|||
# https://gitlab.freedesktop.org/drm/intel/issues/673
|
||||
Patch612: drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1772498#c101
|
||||
Patch602: ASoC-topology-fix-soc_tplg_fe_link_create-link-dobj-.patch
|
||||
|
||||
# This is already in 5.5 rhbz 1794369
|
||||
Patch603: 0001-e1000e-Add-support-for-Comet-Lake.patch
|
||||
|
||||
|
|
@ -1809,6 +1806,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu Feb 06 2020 Jeremy Cline <jcline@redhat.com> - 5.4.18-100
|
||||
- Linux v5.4.18
|
||||
|
||||
* Sat Feb 01 2020 Jeremy Cline <jcline@redhat.com> - 5.4.17-100
|
||||
- Linux v5.4.17
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
|
||||
SHA512 (patch-5.4.17.xz) = 751b3d46f3d3b6bb994a793bb74ca12abe1f9b6d4e45bff6eaab4e3839b8f37a1e4d4dec28ba68648a5c25098ac027995eaebbab13bdebb1f490da379bbaa079
|
||||
SHA512 (patch-5.4.18.xz) = 25e8ca187add056d9275002eded1bcd400e8d216f6db8d15179fda0bf6da934ef5d351ae73b81e9fa6295d784095dd83afe772b38c02bbb72ffb808937dedf93
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue