]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 May 2019 08:36:10 +0000 (10:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 May 2019 08:36:10 +0000 (10:36 +0200)
added patches:
asoc-stm32-fix-sai-driver-name-initialisation.patch

queue-4.14/asoc-stm32-fix-sai-driver-name-initialisation.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/asoc-stm32-fix-sai-driver-name-initialisation.patch b/queue-4.14/asoc-stm32-fix-sai-driver-name-initialisation.patch
new file mode 100644 (file)
index 0000000..1ac7832
--- /dev/null
@@ -0,0 +1,40 @@
+From 17d3069ccf06970e2db3f7cbf4335f207524279e Mon Sep 17 00:00:00 2001
+From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
+Date: Fri, 5 Apr 2019 11:19:11 +0200
+Subject: ASoC: stm32: fix sai driver name initialisation
+
+From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
+
+commit 17d3069ccf06970e2db3f7cbf4335f207524279e upstream.
+
+This patch fixes the sai driver structure overwriting which results in
+a cpu dai name equal NULL.
+
+Fixes: 3e086ed ("ASoC: stm32: add SAI driver")
+
+Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/stm/stm32_sai_sub.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/stm/stm32_sai_sub.c
++++ b/sound/soc/stm/stm32_sai_sub.c
+@@ -873,7 +873,6 @@ static int stm32_sai_sub_dais_init(struc
+       if (!sai->cpu_dai_drv)
+               return -ENOMEM;
+-      sai->cpu_dai_drv->name = dev_name(&pdev->dev);
+       if (STM_SAI_IS_PLAYBACK(sai)) {
+               memcpy(sai->cpu_dai_drv, &stm32_sai_playback_dai,
+                      sizeof(stm32_sai_playback_dai));
+@@ -883,6 +882,7 @@ static int stm32_sai_sub_dais_init(struc
+                      sizeof(stm32_sai_capture_dai));
+               sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name;
+       }
++      sai->cpu_dai_drv->name = dev_name(&pdev->dev);
+       return 0;
+ }
index f09d91061a1c0fd7924c65d4e49b0f1d0d58d135..736892d9dd7f2754fcdc483a0dfd02367024fcaf 100644 (file)
@@ -61,3 +61,4 @@ staging-iio-adt7316-allow-adt751x-to-use-internal-vref-for-all-dacs.patch
 staging-iio-adt7316-fix-the-dac-read-calculation.patch
 staging-iio-adt7316-fix-the-dac-write-calculation.patch
 scsi-rdma-srpt-fix-a-credit-leak-for-aborted-commands.patch
+asoc-stm32-fix-sai-driver-name-initialisation.patch