0001-alsactl-90-alsa-restore.rules-fix-alsa_restore_go-st.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. From f90124c73edd050b24961197a4abcf17e53b41a8 Mon Sep 17 00:00:00 2001
  2. From: Jaroslav Kysela <perex@perex.cz>
  3. Date: Thu, 14 Nov 2024 09:38:49 +0100
  4. Subject: [PATCH 1/2] alsactl: 90-alsa-restore.rules - fix alsa_restore_go/std
  5. Fix the label mismatch which was introduced in the transition from the
  6. temporary test rules.
  7. Closes: https://github.com/alsa-project/alsa-utils/issues/280
  8. Fixes: 8116639 ("alsactl: 90-alsa-restore.rules - add support for AMD ACP digital microphone")
  9. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
  10. Upstream-Status: Backport [https://github.com/alsa-project/alsa-utils/commit/f90124c73edd050b24961197a4abcf17e53b41a8]
  11. Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
  12. ---
  13. alsactl/90-alsa-restore.rules.in | 4 +++-
  14. 1 file changed, 3 insertions(+), 1 deletion(-)
  15. diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
  16. index 85f0b15f4856..dae2ed8ccc8f 100644
  17. --- a/alsactl/90-alsa-restore.rules.in
  18. +++ b/alsactl/90-alsa-restore.rules.in
  19. @@ -3,6 +3,8 @@
  20. ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*",@extratest@ GOTO="alsa_restore_go"
  21. GOTO="alsa_restore_end"
  22. +LABEL="alsa_restore_go"
  23. +
  24. ENV{ALSA_CARD_NUMBER}="$attr{device/number}"
  25. # mark HDA analog card; HDMI/DP card does not have capture devices
  26. @@ -21,7 +23,7 @@ TEST!="/run/udev/alsa-hda-analog-card", GOTO="alsa_restore_std"
  27. IMPORT{program}="/usr/bin/cat /run/udev/alsa-hda-analog-card"
  28. ENV{ALSA_CARD_HDA_ANALOG}!="", ENV{ALSA_CARD_NUMBER}="$env{ALSA_CARD_HDA_ANALOG}"
  29. -LABEL="alsa_restore_go"
  30. +LABEL="alsa_restore_std"
  31. TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ restore $env{ALSA_CARD_NUMBER}"
  32. TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl@args@ nrestore $env{ALSA_CARD_NUMBER}"
  33. --
  34. 2.25.1