forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
From 3c740d90490abe64c86c667934ba5d990817b873 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Wed, 20 Nov 2019 13:20:39 +0100
|
|
Subject: [PATCH 06/26] alsactl: sysfs - add /sys/kernel/uevent_seqnum check to
|
|
init
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
alsactl/init_sysfs.c | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/alsactl/init_sysfs.c b/alsactl/init_sysfs.c
|
|
index 5c789b61b0e5..57ef615a2c76 100644
|
|
--- a/alsactl/init_sysfs.c
|
|
+++ b/alsactl/init_sysfs.c
|
|
@@ -34,6 +34,8 @@ static int sysfs_init(void)
|
|
const char *env;
|
|
char sysfs_test[PATH_SIZE];
|
|
|
|
+ INIT_LIST_HEAD(&attr_list);
|
|
+
|
|
env = getenv("SYSFS_PATH");
|
|
if (env) {
|
|
strlcpy(sysfs_path, env, sizeof(sysfs_path));
|
|
@@ -43,13 +45,16 @@ static int sysfs_init(void)
|
|
dbg("sysfs_path='%s'", sysfs_path);
|
|
|
|
strlcpy(sysfs_test, sysfs_path, sizeof(sysfs_test));
|
|
- strlcat(sysfs_test, "/kernel/uevent_helper", sizeof(sysfs_test));
|
|
+ strlcat(sysfs_test, "/kernel/uevent_seqnum", sizeof(sysfs_test));
|
|
if (access(sysfs_test, F_OK)) {
|
|
- error("sysfs path '%s' is invalid\n", sysfs_path);
|
|
- return -errno;
|
|
+ strlcpy(sysfs_test, sysfs_path, sizeof(sysfs_test));
|
|
+ strlcat(sysfs_test, "/kernel/uevent_helper", sizeof(sysfs_test));
|
|
+ if (access(sysfs_test, F_OK)) {
|
|
+ error("sysfs path '%s' is invalid", sysfs_path);
|
|
+ return -errno;
|
|
+ }
|
|
}
|
|
|
|
- INIT_LIST_HEAD(&attr_list);
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.16.4
|
|
|