From c2ffb0401ee40c1df004d80901484c9976f7e59acf89faf9edcb34b5151ad988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 18 Oct 2018 13:06:28 +0000
Subject: [PATCH] Accepting request 642935 from
 home:tiwai:branches:multimedia:libs

- Fix the incorrect UCM profile for Dell WD15 dock (bsc#1112292):
  0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch

OBS-URL: https://build.opensuse.org/request/show/642935
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=236
---
 ...WD15-Dock-Fix-incorrect-device-names.patch | 48 +++++++++++++++++++
 alsa.changes                                  |  6 +++
 alsa.spec                                     |  2 +
 3 files changed, 56 insertions(+)
 create mode 100644 0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch

diff --git a/0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch b/0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch
new file mode 100644
index 0000000..b07f04f
--- /dev/null
+++ b/0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch
@@ -0,0 +1,48 @@
+From 6eced6b4b6dca9f62ea3d13a40c5991231df3c5c Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 18 Oct 2018 09:38:38 +0200
+Subject: [PATCH] conf/ucm/Dell-WD15-Dock: Fix incorrect device names
+
+The device name string for Dell WD15 (and its variants) dock is set as
+"WD15Dock", while the actual device name to be used is "Dock".
+
+Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1112292
+Fixes: 8ebb40c96970 ("conf/ucm: Add a UCM profile for Dell WD15 Dock USB-audio")
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ src/conf/ucm/Dell-WD15-Dock/HiFi.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf
+index b07f34400086..1b6bd21237f1 100644
+--- a/src/conf/ucm/Dell-WD15-Dock/HiFi.conf
++++ b/src/conf/ucm/Dell-WD15-Dock/HiFi.conf
+@@ -3,7 +3,7 @@ SectionDevice."Headphone" {
+ 
+ 	Value {
+ 		PlaybackChannels "2"
+-		PlaybackPCM "hw:WD15Dock,0"
++		PlaybackPCM "hw:Dock,0"
+ 	}
+ }
+ 
+@@ -12,7 +12,7 @@ SectionDevice."LineOut" {
+ 
+ 	Value {
+ 		PlaybackChannels "2"
+-		PlaybackPCM "hw:WD15Dock,1"
++		PlaybackPCM "hw:Dock,1"
+ 	}
+ }
+ 
+@@ -21,6 +21,6 @@ SectionDevice."Mic" {
+ 
+ 	Value {
+ 		CaptureChannels "2"
+-		CapturePCM "hw:WD15Dock,0"
++		CapturePCM "hw:Dock,0"
+ 	}
+ }
+-- 
+2.19.0
+
diff --git a/alsa.changes b/alsa.changes
index d265eb5..7b25c0c 100644
--- a/alsa.changes
+++ b/alsa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 18 14:26:32 CEST 2018 - tiwai@suse.de
+
+- Fix the incorrect UCM profile for Dell WD15 dock (bsc#1112292):
+  0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch
+
 -------------------------------------------------------------------
 Wed Oct 17 10:22:37 CEST 2018 - tiwai@suse.de
 
diff --git a/alsa.spec b/alsa.spec
index 6d74b95..23860e2 100644
--- a/alsa.spec
+++ b/alsa.spec
@@ -50,6 +50,7 @@ Source34:       alsa-init.sh
 Source40:       50-alsa.conf
 Source41:       install-snd-module
 # upstream fixes
+Patch1:         0001-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch
 # rest suse fixes
 Source101:      chtcx2072x.conf
 Source102:      chtcx2072x-HiFi.conf
@@ -117,6 +118,7 @@ Architecture.
 
 %prep
 %setup -q -n alsa-lib-%{package_version}
+%patch1 -p1
 
 %build
 export AUTOMAKE_JOBS="%{?_smp_mflags}"