6977966888
- Backport upstream fix patches, including the deadlock fix for aplay/arecord (boo#1031525): 0001-ucm-Add-ATTRIBUTE_UNUSED-for-unused-parameters-of-ex.patch 0002-ucm-parser-needs-limits.h.patch 0003-pcm-direct-allow-users-to-configure-different-period.patch 0004-pcm-dshare-enable-silence.patch 0005-pcm-rate-fix-the-hw_ptr-update-until-the-boundary-av.patch 0006-plugin-dynamically-update-avail_min-on-slave.patch 0007-rate-dynamic-update-avail_min-on-slave.patch 0008-topology-fix-unused-const-variable-warning.patch 0009-seq-improve-documentation-about-new-get-pid-card-fun.patch 0010-pcm-direct-returning-semop-error-code-for-semaphore-.patch 0011-pcm-direct-Fix-for-sync-issue-on-xrun-recover.patch 0012-pcm-direct-check-state-before-enter-poll-on-timer.patch 0013-pcm-direct-don-t-return-bogus-buffer-levels-in-xrun-.patch 0014-conf-ucm-broxton-add-broxton-rt298-conf-files.patch 0015-pcm-direct-Fix-deadlock-in-poll_descriptors.patch 0016-ucm-Assure-the-user-input-card-name-not-to-exceed-ma.patch 0017-ucm-Load-device-specific-configuration-file-based-on.patch 0018-ucm-Add-command-get-_file-to-get-the-config-file-nam.patch 0019-topology-Fix-incorrect-license-in-source-comments.patch 0020-conf-cards-add-support-for-pistachio-card.patch 0021-pcm-multi-Drop-the-fixed-slave_map-in-snd_pcm_multi_.patch 0022-conf-Add-card-config-for-Intel-HDMI-DP-LPE-audio.patch 0023-pcm-Avoid-lock-for-snd_pcm_nonblock.patch 0024-pcm-Disable-locking-in-async-mode.patch 0025-pcm-dmix-Allow-disabling-x86-optimizations.patch 0026-pcm-dmix_rewind-corrupts-application-pointer-fix.patch 0027-pcm-direct-fix-race-on-clearing-timer-events.patch 0028-pcm-file-Enable-file-writing-for-capture-path.patch OBS-URL: https://build.opensuse.org/request/show/483406 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=210
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From b0e4652881f883023d2b190cf3897b7494d8d0ed Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 27 Feb 2017 09:25:24 +0100
|
|
Subject: [PATCH 33/43] pcm_plugin: unify the snd_pcm_mmap_begin result value
|
|
checking
|
|
|
|
---
|
|
src/pcm/pcm_plugin.c | 26 +++++++++++++++++++-------
|
|
1 file changed, 19 insertions(+), 7 deletions(-)
|
|
|
|
--- a/src/pcm/pcm_plugin.c
|
|
+++ b/src/pcm/pcm_plugin.c
|
|
@@ -251,8 +251,12 @@ static snd_pcm_sframes_t snd_pcm_plugin_
|
|
snd_pcm_uframes_t slave_offset;
|
|
snd_pcm_uframes_t slave_frames = ULONG_MAX;
|
|
|
|
- err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
- if (err < 0 || slave_frames == 0)
|
|
+ result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
+ if (result < 0) {
|
|
+ err = result;
|
|
+ goto error;
|
|
+ }
|
|
+ if (slave_frames == 0)
|
|
break;
|
|
frames = plugin->write(pcm, areas, offset, frames,
|
|
slave_areas, slave_offset, &slave_frames);
|
|
@@ -304,7 +308,11 @@ static snd_pcm_sframes_t snd_pcm_plugin_
|
|
snd_pcm_uframes_t slave_offset;
|
|
snd_pcm_uframes_t slave_frames = ULONG_MAX;
|
|
|
|
- snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
+ result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
+ if (result < 0) {
|
|
+ err = result;
|
|
+ goto error;
|
|
+ }
|
|
if (slave_frames == 0)
|
|
break;
|
|
frames = (plugin->read)(pcm, areas, offset, frames,
|
|
@@ -409,9 +417,11 @@ snd_pcm_plugin_mmap_commit(snd_pcm_t *pc
|
|
snd_pcm_uframes_t slave_frames = ULONG_MAX;
|
|
snd_pcm_sframes_t result;
|
|
|
|
- err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
- if (err < 0)
|
|
+ result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
+ if (result < 0) {
|
|
+ err = result;
|
|
goto error;
|
|
+ }
|
|
if (frames > cont)
|
|
frames = cont;
|
|
frames = plugin->write(pcm, areas, appl_offset, frames,
|
|
@@ -481,9 +491,11 @@ static snd_pcm_sframes_t snd_pcm_plugin_
|
|
snd_pcm_uframes_t slave_frames = ULONG_MAX;
|
|
snd_pcm_sframes_t result;
|
|
|
|
- err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
- if (err < 0)
|
|
+ result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
|
|
+ if (result < 0) {
|
|
+ err = result;
|
|
goto error;
|
|
+ }
|
|
if (frames > cont)
|
|
frames = cont;
|
|
frames = (plugin->read)(pcm, areas, hw_offset, frames,
|