Takashi Iwai
f936d7ca95
- Backport upstream fixes: various fixes in aplay, alsamixer, alsactl and alsaloop, updated translations, etc: 0001-aplay-try-to-use-16-bit-format-to-increase-capture-q.patch 0002-alsamixer-Fix-the-mixer-views-description-in-man-pag.patch 0003-Add-Slovak-translation.patch 0004-Add-Basque-translation.patch 0006-aplay-cosmetic-code-fix-in-xrun.patch 0007-aplay-fix-the-CPU-busy-loop-in-the-pause-handler.patch 0008-alsa-info-Add-lsusb-and-stream-outputs.patch 0013-aplay-add-test-code-for-snd_pcm_status-to-test-posit.patch 0014-ucm-fix-typo-in-docs.patch 0015-aplay-add-avail-delay-checks-to-test-position.patch 0016-alsactl-daemon-read_pid_file-fix-the-returned-code-o.patch 0017-alsactl-init-set_ctl_value-fix-bytes-parsing.patch 0018-alsactl-init-parse-fix-possible-double-free.patch 0019-alsaloop-fix-possible-memory-leak-in-create_loopback.patch 0020-alsaloop-get_queued_playback_samples-simplify-code.patch 0021-topology-fix-possible-double-free-in-load.patch 0022-alsamixer-remove-dead-fcn-widget_handle_key-in-widge.patch 0023-alsamixer-remove-unused-variable-y-in-display_scroll.patch 0024-alsamixer-fix-shift-in-parse_words.patch 0025-aplay-fix-the-test-position-test-for-playback-avail-.patch OBS-URL: https://build.opensuse.org/request/show/865332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=188
28 lines
752 B
Diff
28 lines
752 B
Diff
From 42ca978078e09eb7e0044d2d8453b1a9cb69d9fe Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 8 Jan 2021 18:07:57 +0100
|
|
Subject: [PATCH 16/25] alsactl: daemon - read_pid_file() fix the returned code
|
|
on read error
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
alsactl/daemon.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/alsactl/daemon.c b/alsactl/daemon.c
|
|
index 65f7ac1cdd0a..ee03991ef5f1 100644
|
|
--- a/alsactl/daemon.c
|
|
+++ b/alsactl/daemon.c
|
|
@@ -284,7 +284,7 @@ static long read_pid_file(const char *pidfile)
|
|
err = err < 0 ? -errno : -EIO;
|
|
close(fd);
|
|
pid_txt[11] = '\0';
|
|
- return atol(pid_txt);
|
|
+ return err < 0 ? err : atol(pid_txt);
|
|
} else {
|
|
return -errno;
|
|
}
|
|
--
|
|
2.26.2
|
|
|