From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 10 Jun 2024 06:47:23 +0000 (+0200)
Subject: sof-soundwire: fix missing MultiCodec1 initialization and Empty condition
X-Git-Tag: v1.2.12~1
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=4aa9822afaae2138f342c35c04127d28331274e0;p=alsa-ucm-conf.git

sof-soundwire: fix missing MultiCodec1 initialization and Empty condition

Fixes: ab2b4f1 ("ucm2: soundwire: add rt722 SDCA device")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
index de200ab..31492e3 100644
--- a/ucm2/sof-soundwire/sof-soundwire.conf
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -16,6 +16,7 @@ Define {
 	MicCodec1 ""
 	Mics1 "0"
 	Iec61937Pcms1 ""
+	MultiCodec1 ""
 }
 
 DefineRegex {
@@ -47,17 +48,16 @@ DefineRegex {
 		Regex "iec61937-pcm:(([0-9]+(,))*[0-9]+)"
 		String "${CardComponents}"
 	}
-}
-
-DefineRegex.MultiCodec {
-	Regex "(rt722(-sdca)?)"
-	String "${var:SpeakerCodec1} ${var:HeadsetCodec1} ${var:MicCodec1}"
+	MultiCodec {
+		Regex "(rt722(-sdca)?)"
+		String "${var:SpeakerCodec1} ${var:HeadsetCodec1} ${var:MicCodec1}"
+	}
 }
 
 If.multi_init {
 	Condition {
 		Type String
-		Empty "${var:MultiCodec1} "
+		Empty "${var:MultiCodec1}"
 	}
 	False {
 		Define {