]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: dapm: connect virtual mux with default value
author이경택 <gt82.lee@samsung.com>
Tue, 31 Mar 2020 07:55:16 +0000 (16:55 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Apr 2020 08:48:43 +0000 (10:48 +0200)
commit 3bbbb7728fc853d71dbce4073fef9f281fbfb4dd upstream.

Since a virtual mixer has no backing registers
to decide which path to connect,
it will try to match with initial state.
This is to ensure that the default mixer choice will be
correctly powered up during initialization.
Invert flag is used to select initial state of the virtual switch.
Since actual hardware can't be disconnected by virtual switch,
connected is better choice as initial state in many cases.

Signed-off-by: Gyeongtaek Lee <gt82.lee@samsung.com>
Link: https://lore.kernel.org/r/01a301d60731$b724ea10$256ebe30$@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-dapm.c

index db5b005f4b1edbf5b2b76818a6f635e83678185d..d61e954417d082fc48e472574b80b41c05c7c2c3 100644 (file)
@@ -792,7 +792,13 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i,
                        val = max - val;
                p->connect = !!val;
        } else {
-               p->connect = 0;
+               /* since a virtual mixer has no backing registers to
+                * decide which path to connect, it will try to match
+                * with initial state.  This is to ensure
+                * that the default mixer choice will be
+                * correctly powered up during initialization.
+                */
+               p->connect = invert;
        }
 }