Takashi Iwai
4f970fe93d
- Remove hackish modprobe install scripts for auto-loading OSS and sequencer modules (bsc#1136562); it's invoked from systemd unit file included in alsa-utils now - Backport upstream fixes: 0001-pcm-direct-Add-generic-hw_ptr_alignment-function-for.patch 0002-pcm-dshare-Added-hw_ptr_alignment-option-in-configur.patch 0003-pcm-dsnoop-Added-hw_ptr_alignment-option-in-configur.patch 0004-pcm-file-add-support-for-infile-reading-in-non-inter.patch 0005-pcm-file-use-snd_pcm_file_areas_read_infile-for-read.patch 0006-pcm-file-add-missing-unlock-on-early-return.patch 0007-ucm-Add-UCM-profile-for-CX2072X-codec-on-Baytrail-Ch.patch 0008-pcm-add-mmap_begin-callback-to-snd_pcm_fast_ops_t-ap.patch 0009-pcm-file-add-infile-read-support-for-mmap-mode.patch 0010-aserver-fix-resource-leak-coverity.patch 0011-src-conf.c-add-missing-va_end-call-coverity.patch 0012-config-parse_string-fix-the-dynamic-buffer-allocatio.patch 0013-control_shm-remove-duplicate-code-coverity.patch 0014-control_shm-add-missing-socket-close-to-the-error-pa.patch 0015-pcm-fix-memory-leak-in-_snd_pcm_parse_config_chmaps-.patch 0016-pcm_file-call-pclose-correctly-for-popen-coverity.patch 0017-pcm_hw-close-file-descriptor-in-the-error-path-in-sn.patch 0018-rawmidi-use-snd_dlobj_cache_get2-in-rawmidi-open-cov.patch 0019-rawmidi_hw-add-sanity-check-for-the-invalid-stream-a.patch 0020-topology-various-coverity-fixes.patch 0021-ucm-coverity-fixes.patch 0022-pcm_file-coverity-fixes-including-double-locking.patch 0023-topology-next-round-of-coverity-fixes.patch 0024-pcm_file-another-locking-fix-coverity.patch 0025-ucm-another-coverity-fix-in-uc_mgr_config_load.patch - Drop the downstream CX2072X UCM profile, which is replaced with OBS-URL: https://build.opensuse.org/request/show/706089 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=253
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 33c7ea0865b7f87cef1c3d3e767734c0edd02e84 Mon Sep 17 00:00:00 2001
|
|
From: Adam Miartus <amiartus@de.adit-jv.com>
|
|
Date: Thu, 23 May 2019 11:44:30 +0200
|
|
Subject: [PATCH 06/25] pcm: file: add missing unlock on early return
|
|
|
|
Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_file.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
|
|
index dcaa41d10e35..8e2c70b12ab1 100644
|
|
--- a/src/pcm/pcm_file.c
|
|
+++ b/src/pcm/pcm_file.c
|
|
@@ -584,8 +584,10 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc
|
|
__snd_pcm_lock(pcm);
|
|
|
|
frames = _snd_pcm_readi(file->gen.slave, buffer, size);
|
|
- if (frames <= 0)
|
|
+ if (frames <= 0) {
|
|
+ __snd_pcm_unlock(pcm);
|
|
return frames;
|
|
+ }
|
|
|
|
snd_pcm_areas_from_buf(pcm, areas, buffer);
|
|
snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);
|
|
@@ -605,8 +607,10 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm
|
|
|
|
__snd_pcm_lock(pcm);
|
|
frames = _snd_pcm_readn(file->gen.slave, bufs, size);
|
|
- if (frames <= 0)
|
|
+ if (frames <= 0) {
|
|
+ __snd_pcm_unlock(pcm);
|
|
return frames;
|
|
+ }
|
|
|
|
snd_pcm_areas_from_bufs(pcm, areas, bufs);
|
|
snd_pcm_file_areas_read_infile(pcm, areas, 0, frames);
|
|
--
|
|
2.16.4
|
|
|