diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-04-08 18:08:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-08 18:08:09 +0200 |
| commit | ddd5609fe8b682fbe81f71b27561f14d3611d856 (patch) | |
| tree | d72d453180c0c25990524813a6b54a0555453d5e /sound/soc/soc-dapm.c | |
| parent | ALSA: hda: Add driver blacklist (diff) | |
| parent | ASoC: cs4270: pull reset GPIO low then high (diff) | |
| download | linux-ddd5609fe8b682fbe81f71b27561f14d3611d856.tar.xz linux-ddd5609fe8b682fbe81f71b27561f14d3611d856.zip | |
Merge tag 'asoc-fix-v5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.7
A collection of fixes that have been accumilated since the merge window,
mainly relating to x86 platform support.
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 04da7928c873..679ed60d850e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -802,7 +802,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; } } |