diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-15 04:05:46 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-15 04:06:38 -0400 |
commit | 28d1a85e136985982448b2f9b1342bae85ad1c98 (patch) | |
tree | 053bcffb19dd99891f06836c06d98a02bed41753 /sound | |
parent | c602c8ad45d6ee6ad91fc544513cc96f70790983 (diff) |
ALSA: hda - Add an error message for invalid mapping NID
Add an error message to snd_hda_add_nid() for invalid mapping NID to make
easier to hunt the buggy code.
Also added a missing space to the error message in snd_hda_build_controls()
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 5bd7cf45f3a5..0e76ac2b2ace 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1806,6 +1806,8 @@ int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl, | |||
1806 | item->nid = nid; | 1806 | item->nid = nid; |
1807 | return 0; | 1807 | return 0; |
1808 | } | 1808 | } |
1809 | printk(KERN_ERR "hda-codec: no NID for mapping control %s:%d:%d\n", | ||
1810 | kctl->id.name, kctl->id.index, index); | ||
1809 | return -EINVAL; | 1811 | return -EINVAL; |
1810 | } | 1812 | } |
1811 | EXPORT_SYMBOL_HDA(snd_hda_add_nid); | 1813 | EXPORT_SYMBOL_HDA(snd_hda_add_nid); |
@@ -2884,7 +2886,7 @@ int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus) | |||
2884 | list_for_each_entry(codec, &bus->codec_list, list) { | 2886 | list_for_each_entry(codec, &bus->codec_list, list) { |
2885 | int err = snd_hda_codec_build_controls(codec); | 2887 | int err = snd_hda_codec_build_controls(codec); |
2886 | if (err < 0) { | 2888 | if (err < 0) { |
2887 | printk(KERN_ERR "hda_codec: cannot build controls" | 2889 | printk(KERN_ERR "hda_codec: cannot build controls " |
2888 | "for #%d (error %d)\n", codec->addr, err); | 2890 | "for #%d (error %d)\n", codec->addr, err); |
2889 | err = snd_hda_codec_reset(codec); | 2891 | err = snd_hda_codec_reset(codec); |
2890 | if (err < 0) { | 2892 | if (err < 0) { |