LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jerome Brunet <jbrunet@baylibre.com>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Kevin Hilman <khilman@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>,
alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org
Subject: [PATCH 2/5] ASoC: dapm: allow muxes to force a disconnect
Date: Wed, 15 May 2019 15:18:55 +0200 [thread overview]
Message-ID: <20190515131858.32130-3-jbrunet@baylibre.com> (raw)
In-Reply-To: <20190515131858.32130-1-jbrunet@baylibre.com>
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>
---
sound/soc/soc-dapm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.20.1
next prev parent reply other threads:[~2019-05-15 13:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 13:18 [PATCH 0/5] ASoC: meson: add hdmitx glue support Jerome Brunet
2019-05-15 13:18 ` [PATCH 1/5] ASoC: meson: axg-card: set link name based on link node name Jerome Brunet
2019-05-16 11:13 ` Applied "ASoC: meson: axg-card: set link name based on link node name" to the asoc tree Mark Brown
2019-05-15 13:18 ` Jerome Brunet [this message]
2019-05-16 11:13 ` Applied "ASoC: dapm: allow muxes to force a disconnect" " Mark Brown
2019-05-15 13:18 ` [PATCH 3/5] ASoC: meson: add tohdmitx DT bindings Jerome Brunet
2019-05-16 11:13 ` Applied "ASoC: meson: add tohdmitx DT bindings" to the asoc tree Mark Brown
2019-05-15 13:18 ` [PATCH 4/5] ASoC: meson: axg-card: add basic codec-to-codec link support Jerome Brunet
2019-05-16 11:13 ` Applied "ASoC: meson: axg-card: add basic codec-to-codec link support" to the asoc tree Mark Brown
2019-05-15 13:18 ` [PATCH 5/5] ASoC: meson: add g12a tohdmitx control Jerome Brunet
2019-05-16 11:13 ` Applied "ASoC: meson: add g12a tohdmitx control" to the asoc tree Mark Brown
2019-05-15 13:32 ` [PATCH 0/5] ASoC: meson: add hdmitx glue support Neil Armstrong
2019-05-15 18:33 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190515131858.32130-3-jbrunet@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=khilman@baylibre.com \
--cc=lgirdwood@gmail.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--subject='Re: [PATCH 2/5] ASoC: dapm: allow muxes to force a disconnect' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).