From 1a831c59a27b7a4dc90b3ce63de907d2ab00438d Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 19 Oct 2007 08:13:40 +0200
Subject: [PATCH] --- yaml --- r: 72174 b: refs/heads/master c:
 35a1e0cce647737b88dac7ca526fc525d92b3fff h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 9 ++-------
 trunk/sound/pci/hda/hda_local.h | 7 +++++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 5bb1bc453972..8949571996bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8229c38c61b1acab1f3fc28275690da71907248
+refs/heads/master: 35a1e0cce647737b88dac7ca526fc525d92b3fff
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index 187533e477c6..ad4cb38109fc 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -626,24 +626,19 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
 		snd_hda_get_codec_name(codec, bus->card->mixername,
 				       sizeof(bus->card->mixername));
 
-#ifdef CONFIG_SND_HDA_GENERIC
 	if (is_generic_config(codec)) {
 		err = snd_hda_parse_generic_codec(codec);
 		goto patched;
 	}
-#endif
 	if (codec->preset && codec->preset->patch) {
 		err = codec->preset->patch(codec);
 		goto patched;
 	}
 
 	/* call the default parser */
-#ifdef CONFIG_SND_HDA_GENERIC
 	err = snd_hda_parse_generic_codec(codec);
-#else
-	printk(KERN_ERR "hda-codec: No codec parser is available\n");
-	err = -ENODEV;
-#endif
+	if (err < 0)
+		printk(KERN_ERR "hda-codec: No codec parser is available\n");
 
  patched:
 	if (err < 0) {
diff --git a/trunk/sound/pci/hda/hda_local.h b/trunk/sound/pci/hda/hda_local.h
index a79d0ed5469c..a708effdcdad 100644
--- a/trunk/sound/pci/hda/hda_local.h
+++ b/trunk/sound/pci/hda/hda_local.h
@@ -245,7 +245,14 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
 /*
  * generic codec parser
  */
+#ifdef CONFIG_SND_HDA_GENERIC
 int snd_hda_parse_generic_codec(struct hda_codec *codec);
+#else
+static inline int snd_hda_parse_generic_codec(struct hda_codec *codec)
+{
+	return -ENODEV;
+}
+#endif
 
 /*
  * generic proc interface