summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-08 14:36:03 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-10 11:28:26 +0200
commit25c77c5fae5e0ef43ab6381f89fc41e26d2ca0f4 (patch)
tree2ade2999a71f1c48b3ea389c0c4bf4e29388d5ee /sound
parentASoC: Squash error codes from regmap down to -1 on read (diff)
downloadlinux-25c77c5fae5e0ef43ab6381f89fc41e26d2ca0f4.tar.xz
linux-25c77c5fae5e0ef43ab6381f89fc41e26d2ca0f4.zip
ASoC: Fix DAPM sync for TLV320AIC3x custom DAPM widget
We really should be doing this in the core, not in a driver... Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c4
-rw-r--r--sound/soc/soc-dapm.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index d877b39b5000..be55b7f36282 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -197,6 +197,10 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
else
/* old connection must be powered down */
path->connect = invert ? 1 : 0;
+
+ dapm_mark_dirty(path->source, "tlv320aic3x source");
+ dapm_mark_dirty(path->sink, "tlv320aic3x sink");
+
break;
}
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 258326b031cf..f42e8b9fb17d 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -124,7 +124,7 @@ static bool dapm_dirty_widget(struct snd_soc_dapm_widget *w)
return !list_empty(&w->dirty);
}
-static void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason)
+void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason)
{
if (!dapm_dirty_widget(w)) {
dev_vdbg(w->dapm->dev, "Marking %s dirty due to %s\n",
@@ -132,6 +132,7 @@ static void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason)
list_add_tail(&w->dirty, &w->dapm->card->dapm_dirty);
}
}
+EXPORT_SYMBOL_GPL(dapm_mark_dirty);
/* create a new dapm widget */
static inline struct snd_soc_dapm_widget *dapm_cnew_widget(