Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 188191
b: refs/heads/master
c: 28d1a85
h: refs/heads/master
i:
  188189: 71600d6
  188187: b8a85c3
  188183: 76327bc
  188175: 1928c82
  188159: 8123905
v: v3
  • Loading branch information
Takashi Iwai committed Mar 15, 2010
1 parent 81dd43c commit 0c8b789
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c602c8ad45d6ee6ad91fc544513cc96f70790983
refs/heads/master: 28d1a85e136985982448b2f9b1342bae85ad1c98
4 changes: 3 additions & 1 deletion trunk/sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1806,6 +1806,8 @@ int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl,
item->nid = nid;
return 0;
}
printk(KERN_ERR "hda-codec: no NID for mapping control %s:%d:%d\n",
kctl->id.name, kctl->id.index, index);
return -EINVAL;
}
EXPORT_SYMBOL_HDA(snd_hda_add_nid);
Expand Down Expand Up @@ -2884,7 +2886,7 @@ int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus)
list_for_each_entry(codec, &bus->codec_list, list) {
int err = snd_hda_codec_build_controls(codec);
if (err < 0) {
printk(KERN_ERR "hda_codec: cannot build controls"
printk(KERN_ERR "hda_codec: cannot build controls "
"for #%d (error %d)\n", codec->addr, err);
err = snd_hda_codec_reset(codec);
if (err < 0) {
Expand Down

0 comments on commit 0c8b789

Please sign in to comment.