From: Johan Hovold <johan+linaro@kernel.org>
Date: Thu, 15 May 2025 13:19:01 +0000 (+0200)
Subject: ucm2: USB-Audio: Behringer: Flow8: fix conflicting
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=24d62b54d5ad6c7e6f9cff4cedcc334b1c98602f;p=alsa-ucm-conf.git

ucm2: USB-Audio: Behringer: Flow8: fix conflicting
 devices

A recent change renamed the Line-56 and Line-78 devices but failed to
update the conflicting device lists.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/563
Fixes: ea7a065a7b50 ("ucm: fix SectionDevice identifiers")
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf b/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf
index 5dce19c..8ce7590 100644
--- a/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf
+++ b/ucm2/USB-Audio/Behringer/Flow8-Recording-Hifi.conf
@@ -157,7 +157,7 @@ SectionDevice."Line5" {
 	Comment "Line/Inst 5 (L)"
 
 	ConflictingDevice [
-		"Line56"
+		"Line9"
 	]
 
 	Value {
@@ -177,7 +177,7 @@ SectionDevice."Line6" {
 	Comment "Line/Inst(HiZ) 6 (R)"
 
 	ConflictingDevice [
-		"Line56"
+		"Line9"
 	]
 
 	Value {
@@ -197,7 +197,7 @@ SectionDevice."Line7" {
 	Comment "Line/Inst 7 (L)"
 
 	ConflictingDevice [
-		"Line78"
+		"Line10"
 	]
 
 	Value {
@@ -217,7 +217,7 @@ SectionDevice."Line8" {
 	Comment "Line/Inst(HiZ) 8 (R)"
 
 	ConflictingDevice [
-		"Line78"
+		"Line10"
 	]
 
 	Value {