6117f9abfc
- Backport upstream fixes (bsc#1012594):
- A few PCM bugs have been fixed:
* Stall of dmix and others in a wrong PCM state
* Refactoring of PCM locking scheme
* SHM initialization race fix
* plug PCM memory leaks
* Improvement of dshare/dmix delay calculation
* Fix endless dshare draining
* Fix semaphore discard race fix of direct plugins
- UCM fixes and updates for DB410c and skylake-r5286
- Mixer code cleanup not to install bogus plugin codes
- Documentation fixes / updates
0001-ucm-Add-ucm-files-for-DB410c-board.patch
0002-mixer-Fix-rounding-mode-documentation.patch
0003-pcm-Fix-shm-initialization-race-condition.patch
0004-pcm-Better-understandable-locking-code.patch
0005-ucm-fix-crash-when-calling-snd_use_case_geti-with-no.patch
0006-ucm-docs-typeset-lists-of-identifiers-explicitly.patch
0007-Update-include-sound-tlv.h-from-4.9-pre-kernel-uapi.patch
0008-test-use-actual-information-for-TLV-operation.patch
0009-ctl-improve-API-documentation-for-TLV-operation.patch
0010-ctl-improve-documentation-about-TLV-related-APIs.patch
0011-ctl-correct-documentation-about-TLV-feature.patch
0012-conf-ucm-skylake-add-skylake-rt286-conf-files.patch
0013-pcm_plug-Clear-plugins-on-all-error-conditions.patch
0014-mixer-Don-t-install-smixer-modules-unless-python-is-.patch
0015-pcm_dshare-Do-not-discard-slave-reported-delay-in-st.patch
0016-pcm-direct-Protect-from-freeing-semaphore-when-alrea.patch
0017-pcm-dshare-Fix-endless-playback-of-buffer.patch
0018-pcm-Add-the-PCM-state-checks-to-plugins.patch
OBS-URL: https://build.opensuse.org/request/show/442719
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=202
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From ced8722f7d98c946d1429e46252ccc061272d0db Mon Sep 17 00:00:00 2001
|
|
From: Michael Forney <mforney@mforney.org>
|
|
Date: Wed, 19 Oct 2016 18:22:56 -0700
|
|
Subject: [PATCH] pcm_plug: Clear plugins on all error conditions
|
|
|
|
Otherwise, they will linger after the error is returned (but pcm->setup == 0).
|
|
Then, if the caller tries to clean up and call snd_pcm_close(), the assertion
|
|
plug->gen.slave == plug->req_slave will fail.
|
|
|
|
Signed-off-by: Michael Forney <mforney@mforney.org>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_plug.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
|
|
index 5639b9ea8044..266707b425c1 100644
|
|
--- a/src/pcm/pcm_plug.c
|
|
+++ b/src/pcm/pcm_plug.c
|
|
@@ -652,8 +652,10 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm,
|
|
(plug->ttable && !plug->ttable_ok)) {
|
|
snd_pcm_t *new;
|
|
int err;
|
|
- if (k >= sizeof(funcs)/sizeof(*funcs))
|
|
+ if (k >= sizeof(funcs)/sizeof(*funcs)) {
|
|
+ snd_pcm_plug_clear(pcm);
|
|
return -EINVAL;
|
|
+ }
|
|
err = funcs[k](pcm, &new, client, &p);
|
|
if (err < 0) {
|
|
snd_pcm_plug_clear(pcm);
|
|
--
|
|
2.10.2
|
|
|