]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: ASoC: Dump DAPM state for non-stream changes
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 7 Jul 2008 18:26:04 +0000 (19:26 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 10 Jul 2008 07:32:48 +0000 (09:32 +0200)
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>
sound/soc/soc-dapm.c

index d18ebc62786187554dcc1b242762927413c7a103..2c87061c2a6b4d7b9c35d7479d782462a0d8b3c1 100644 (file)
@@ -717,8 +717,10 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
                        path->connect = 0; /* old connection must be powered down */
        }
 
-       if (found)
+       if (found) {
                dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
+               dump_dapm(widget->codec, "mux power update");
+       }
 
        return 0;
 }
@@ -754,8 +756,10 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
                break;
        }
 
-       if (found)
+       if (found) {
                dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
+               dump_dapm(widget->codec, "mixer power update");
+       }
 
        return 0;
 }
@@ -906,7 +910,9 @@ static int snd_soc_dapm_set_pin(struct snd_soc_codec *codec,
  */
 int snd_soc_dapm_sync(struct snd_soc_codec *codec)
 {
-       return dapm_power_widgets(codec, SND_SOC_DAPM_STREAM_NOP);
+       int ret = dapm_power_widgets(codec, SND_SOC_DAPM_STREAM_NOP);
+       dump_dapm(codec, "sync");
+       return ret;
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_sync);