summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2025-12-26 14:59:50 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2025-12-26 15:10:20 +0100
commit6ecb175587edefa522cfdf5a03bf65ab62a188e1 (patch)
tree9e9c37f8ff80784de1f632229e013cd92d69f2ba
parent5bae602366cefb0a110d1b27aa40e423a4f6650d (diff)
downloadmeta-freescale-6ecb175587edefa522cfdf5a03bf65ab62a188e1.tar.gz
also-lib: drop patch
The backported patch was since fixed by a subsequent patch upstream. This effectively reverted the patch and added the fix in a different location. Assuming upstream fixed it correctly the patch is no longer needed. Compare with: https://git.alsa-project.org/?p=alsa-lib.git;a=commit;h=39060852d810461dc8cd1464cfb2ffe84da42d56 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch41
-rw-r--r--recipes-multimedia/alsa/alsa-lib_%.bbappend1
2 files changed, 0 insertions, 42 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch b/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
deleted file mode 100644
index 193d507eb..000000000
--- a/recipes-multimedia/alsa/alsa-lib/0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 3950e1ae36ca53a67b7248137e6033e7e99f79a3 Mon Sep 17 00:00:00 2001
2From: Jaroslav Kysela <perex@perex.cz>
3Date: Wed, 9 Nov 2022 08:11:42 +0100
4Subject: [PATCH] pcm: rate - fix the crash in
5
6Upstream-Status: Backport
7
8 snd_pcm_rate_may_wait_for_avail_min()
9
10The pcm argument passed to the conversion function in
11snd_pcm_plugin_may_wait_for_avail_min_conv() should be
12pcm->fast_op_arg.
13
14Test command: arecord -Dplughw:x -r12000 -c2 -fS16_LE -M temp.wav
15
16Fixes: d9dbb57b ("pcm: rate - rewrite the may_wait_for_avail_min callback for the rate plugin")
17
18BugLink: https://lore.kernel.org/alsa-devel/1667793912-18957-1-git-send-email-shengjiu.wang@nxp.com/
19Fixes: https://github.com/alsa-project/alsa-lib/issues/282
20Reported-by: Shengjiu Wang <shengjiu.wang@nxp.com>
21Signed-off-by: Jaroslav Kysela <perex@perex.cz>
22---
23 src/pcm/pcm_plugin.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
27index 9d7e233e8437..d58789eca73b 100644
28--- a/src/pcm/pcm_plugin.c
29+++ b/src/pcm/pcm_plugin.c
30@@ -626,7 +626,7 @@ int snd_pcm_plugin_may_wait_for_avail_min_conv(
31 * This code is also used by extplug, but extplug does not allow to alter the sampling rate.
32 */
33 if (conv)
34- needed_slave_avail_min = conv(pcm, needed_slave_avail_min);
35+ needed_slave_avail_min = conv(pcm->fast_op_arg, needed_slave_avail_min);
36
37 if (slave->avail_min != needed_slave_avail_min) {
38 snd_pcm_sw_params_t *swparams;
39--
402.42.0
41
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 230cf0957..a8935ed51 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -5,7 +5,6 @@ IMX_PATCH = " \
5 file://0005-add-ak4458-conf-for-multichannel-support.patch \ 5 file://0005-add-ak4458-conf-for-multichannel-support.patch \
6 file://0006-add-conf-for-iMX-XCVR-sound-card.patch \ 6 file://0006-add-conf-for-iMX-XCVR-sound-card.patch \
7 file://0007-add-conf-for-imx-cs42448-sound-card.patch \ 7 file://0007-add-conf-for-imx-cs42448-sound-card.patch \
8 file://0001-pcm-rate-fix-the-crash-in-snd_pcm_rate_may_wait_for_.patch \
9" 8"
10SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}" 9SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
11 10