]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: Log automatic pin disconnection per CODEC rather than per card
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 27 Nov 2011 19:42:20 +0000 (19:42 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 27 Nov 2011 19:45:37 +0000 (19:45 +0000)
This makes the output a bit less confusing on multi-CODEC systems as the
same pin may appear in multiple CODECs.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/soc-dapm.c

index 1ecd1b4927f95c816b211e4e7893f25d29601e0c..da5c1ae7cc300af44559d23910d32f9c1ff3e19e 100644 (file)
@@ -2996,7 +2996,7 @@ void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec)
        struct snd_soc_dapm_context *dapm = &codec->dapm;
        struct snd_soc_dapm_widget *w;
 
-       dev_dbg(card->dev, "Auto NC: DAPMs: card:%p codec:%p\n",
+       dev_dbg(codec->dev, "Auto NC: DAPMs: card:%p codec:%p\n",
                &card->dapm, &codec->dapm);
 
        list_for_each_entry(w, &card->widgets, list) {
@@ -3006,10 +3006,10 @@ void snd_soc_dapm_auto_nc_codec_pins(struct snd_soc_codec *codec)
                case snd_soc_dapm_input:
                case snd_soc_dapm_output:
                case snd_soc_dapm_micbias:
-                       dev_dbg(card->dev, "Auto NC: Checking widget %s\n",
+                       dev_dbg(codec->dev, "Auto NC: Checking widget %s\n",
                                w->name);
                        if (!snd_soc_dapm_widget_in_card_paths(card, w)) {
-                               dev_dbg(card->dev,
+                               dev_dbg(codec->dev,
                                        "... Not in map; disabling\n");
                                snd_soc_dapm_nc_pin(dapm, w->name);
                        }