diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 14:42:20 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 14:45:37 -0500 |
commit | a094b80bb603d602bef5d8c02faedab8d06ed484 (patch) | |
tree | 9f95d0509d526173ebb622dbc8cd02218d97ce6a /sound/soc | |
parent | b05d8dc15f346224306bda4b4ae39fc5ace74ee6 (diff) |
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')
-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) | |||
2996 | struct snd_soc_dapm_context *dapm = &codec->dapm; | 2996 | struct snd_soc_dapm_context *dapm = &codec->dapm; |
2997 | struct snd_soc_dapm_widget *w; | 2997 | struct snd_soc_dapm_widget *w; |
2998 | 2998 | ||
2999 | dev_dbg(card->dev, "Auto NC: DAPMs: card:%p codec:%p\n", | 2999 | dev_dbg(codec->dev, "Auto NC: DAPMs: card:%p codec:%p\n", |
3000 | &card->dapm, &codec->dapm); | 3000 | &card->dapm, &codec->dapm); |
3001 | 3001 | ||
3002 | list_for_each_entry(w, &card->widgets, list) { | 3002 | 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) | |||
3006 | case snd_soc_dapm_input: | 3006 | case snd_soc_dapm_input: |
3007 | case snd_soc_dapm_output: | 3007 | case snd_soc_dapm_output: |
3008 | case snd_soc_dapm_micbias: | 3008 | case snd_soc_dapm_micbias: |
3009 | dev_dbg(card->dev, "Auto NC: Checking widget %s\n", | 3009 | dev_dbg(codec->dev, "Auto NC: Checking widget %s\n", |
3010 | w->name); | 3010 | w->name); |
3011 | if (!snd_soc_dapm_widget_in_card_paths(card, w)) { | 3011 | if (!snd_soc_dapm_widget_in_card_paths(card, w)) { |
3012 | dev_dbg(card->dev, | 3012 | dev_dbg(codec->dev, |
3013 | "... Not in map; disabling\n"); | 3013 | "... Not in map; disabling\n"); |
3014 | snd_soc_dapm_nc_pin(dapm, w->name); | 3014 | snd_soc_dapm_nc_pin(dapm, w->name); |
3015 | } | 3015 | } |