From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 1 Mar 2020 14:55:07 +0000 (+0100)
Subject: alsa ucm: do not assign JackHWMute when JackControl is missing for the UCM device
X-Git-Tag: v13.99.2~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4da4670fdb9a09199fb5d3bfaee252b2f4f13128;p=platform%2Fupstream%2Fpulseaudio.git

alsa ucm: do not assign JackHWMute when JackControl is missing for the UCM device

Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/14

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

diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index b7d2c5b9c..8df24e7b5 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -1730,6 +1730,10 @@ static int ucm_create_profile(
         /* JackHWMute contains a list of device names. Each listed device must
          * be associated with the jack object that we just created. */
         jack_hw_mute = pa_proplist_gets(dev->proplist, PA_ALSA_PROP_UCM_JACK_HW_MUTE);
+        if (jack_hw_mute && !jack) {
+            pa_log("[%s] JackHWMute set, but JackControl is missing", name);
+            jack_hw_mute = NULL;
+        }
         if (jack_hw_mute) {
             char *hw_mute_device_name;
             const char *state = NULL;