ALSA: hda: mic: fix HDAMicEnum macro

Expose devices only for existing enums in the source control.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA/HiFi-mic.conf b/ucm2/HDA/HiFi-mic.conf
index e084700a5e0f9787c672683c19972aca36832ef6..f6b3f4bf6fca6ae750d5f25c2bd42ebb146c89d5 100644 (file)
--- a/ucm2/HDA/HiFi-mic.conf
+++ b/ucm2/HDA/HiFi-mic.conf
@@ -115,35 +115,44 @@ If.micdevs {
 # Comment - Long name of the SectionDevice
 # Jack - Jack control if available
 # Priority - CapturePriority
-DefineMacro.HDAMicEnum.SectionDevice."${var:__DevName}" {
-       Comment "${var:__Comment}"
+DefineMacro.HDAMicEnum.If.enum {
+       Condition {
+               Type ControlExists
+               Control "name='${var:SourceControl}'"
+               ControlEnum "${var:__Enum}"
+       }
+       True.SectionDevice."${var:__DevName}" {
+               Comment "${var:__Comment}"
 
-       EnableSequence [
-               cset "name='${var:SourceControl}' '${var:__Enum}'"
-       ]
 
-       Value {
-               CapturePriority "${eval:($__Priority+$MicExtraPriority)}"
-               CapturePCM "hw:${CardId}"
-               CaptureMixerElem "Capture"
-               CaptureVolume "Capture Volume"
-               CaptureSwitch "Capture Switch"
-               CaptureMasterElem "${var:__Enum} Boost"
-       }
-       If.jack {
-               Condition {
-                       Type String
-                       Empty "${var:-__Jack}"
+
+               EnableSequence [
+                       cset "name='${var:SourceControl}' '${var:__Enum}'"
+               ]
+
+               Value {
+                       CapturePriority "${eval:($__Priority+$MicExtraPriority)}"
+                       CapturePCM "hw:${CardId}"
+                       CaptureMixerElem "Capture"
+                       CaptureVolume "Capture Volume"
+                       CaptureSwitch "Capture Switch"
+                       CaptureMasterElem "${var:__Enum} Boost"
+               }
+               If.jack {
+                       Condition {
+                               Type String
+                               Empty "${var:-__Jack}"
+                       }
+                       False.Value.JackControl "${var:__Jack}"
                }
-               False.Value.JackControl "${var:__Jack}"
-       }
 
-       ConflictingDevice [
-               "Mic:hda-int"
-               "Mic:hda-hp"
-               "Mic:hda"
-               "Headset:hda-mic"
-       ]
+               ConflictingDevice [
+                       "Mic:hda-int"
+                       "Mic:hda-hp"
+                       "Mic:hda"
+                       "Headset:hda-mic"
+               ]
+       }
 }
 
 # Macro HDAMicSwitch - Create the SectionDevice for HDA inputs (switches)