diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 20:42:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 20:45:37 +0100 |
| commit | a094b80bb603d602bef5d8c02faedab8d06ed484 (patch) | |
| tree | 9f95d0509d526173ebb622dbc8cd02218d97ce6a /sound/soc/soc-dapm.c | |
| parent | ASoC: Fix CODEC enumeration for auto_nc_codec_pins (diff) | |
| download | linux-a094b80bb603d602bef5d8c02faedab8d06ed484.tar.xz linux-a094b80bb603d602bef5d8c02faedab8d06ed484.zip | |
ASoC: Log automatic pin disconnection per CODEC rather than per card
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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1ecd1b4927f9..da5c1ae7cc30 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -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); } |