diff options
| author | Jerome Brunet | 2019-05-15 15:18:55 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-16 13:13:23 +0200 |
| commit | c3456a4b2142550944f73a87a8f338074508b249 (patch) | |
| tree | ebae0c4d5055bc1dcf4b186011312f2e80755ad5 /sound/soc/soc-dapm.c | |
| parent | ASoC: meson: axg-card: set link name based on link node name (diff) | |
| download | kernel-qcow2-linux-c3456a4b2142550944f73a87a8f338074508b249.tar.gz kernel-qcow2-linux-c3456a4b2142550944f73a87a8f338074508b249.tar.xz kernel-qcow2-linux-c3456a4b2142550944f73a87a8f338074508b249.zip | |
ASoC: dapm: allow muxes to force a disconnect
Let soc_dapm_mux_update_power() accept NULL as 'e' enum.
It makes the code a bit more robust and, more importantly, let the calling
mux force a disconnect of the output path if necessary.
This is useful if the dapm elements following the mux must be off
while updating the mux, to avoid glitches or force a (re)configuration.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Tested-by: Neil Armstrong <narmstrong@baylibre.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 81a7a12196ff..a4d6c068b545 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2245,7 +2245,7 @@ static int soc_dapm_mux_update_power(struct snd_soc_card *card, dapm_kcontrol_for_each_path(path, kcontrol) { found = 1; /* we now need to match the string in the enum to the path */ - if (!(strcmp(path->name, e->texts[mux]))) + if (e && !(strcmp(path->name, e->texts[mux]))) connect = true; else connect = false; |