git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

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