From 0c8b789adc793875835a4d9088d3f3498f3e7162 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 15 Mar 2010 09:05:46 +0100
Subject: [PATCH] --- yaml --- r: 188191 b: refs/heads/master c:
 28d1a85e136985982448b2f9b1342bae85ad1c98 h: refs/heads/master i:   188189:
 71600d678550e7943da4d135ef4a9c64c4478261   188187:
 b8a85c3204db49b28a61787f2e604ed3d13a759d   188183:
 76327bcf6b582b5c199035d64b1fd395eb6c477e   188175:
 1928c823d61cf063cb94f62753e22b708afdb93d   188159:
 8123905a12ebf0c2aec4104701ee1ecc8214eb32 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cda6c0b2fd43..ba3e9f784246 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c602c8ad45d6ee6ad91fc544513cc96f70790983
+refs/heads/master: 28d1a85e136985982448b2f9b1342bae85ad1c98
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index 5bd7cf45f3a5..0e76ac2b2ace 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -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);
@@ -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) {