aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-07-07 14:26:04 -0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 03:32:48 -0400
commit3fccd8b1bf716f1314c76689a3554ea37ad282b6 (patch)
tree6616c9cd0102fcdcad0cb44a89a566d5563e8ae5
parentc1286b8671135006eeb66b0267fa2895561b78e4 (diff)
ALSA: ASoC: Dump DAPM state for non-stream changes
Explicit DAPM syncs are likely to cause DAPM state updates, as are mixer and mux configuration changes, so display the DAPM status after them too. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--sound/soc/soc-dapm.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d18ebc627861..2c87061c2a6b 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -717,8 +717,10 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
717 path->connect = 0; /* old connection must be powered down */ 717 path->connect = 0; /* old connection must be powered down */
718 } 718 }
719 719
720 if (found) 720 if (found) {
721 dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP); 721 dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
722 dump_dapm(widget->codec, "mux power update");
723 }
722 724
723 return 0; 725 return 0;
724} 726}
@@ -754,8 +756,10 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
754 break; 756 break;
755 } 757 }
756 758
757 if (found) 759 if (found) {
758 dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP); 760 dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
761 dump_dapm(widget->codec, "mixer power update");
762 }
759 763
760 return 0; 764 return 0;
761} 765}
@@ -906,7 +910,9 @@ static int snd_soc_dapm_set_pin(struct snd_soc_codec *codec,
906 */ 910 */
907int snd_soc_dapm_sync(struct snd_soc_codec *codec) 911int snd_soc_dapm_sync(struct snd_soc_codec *codec)
908{ 912{
909 return dapm_power_widgets(codec, SND_SOC_DAPM_STREAM_NOP); 913 int ret = dapm_power_widgets(codec, SND_SOC_DAPM_STREAM_NOP);
914 dump_dapm(codec, "sync");
915 return ret;
910} 916}
911EXPORT_SYMBOL_GPL(snd_soc_dapm_sync); 917EXPORT_SYMBOL_GPL(snd_soc_dapm_sync);
912 918