Re: [patch] snd: fix build bug with CONFIG_SND_HDA_CODEC_SIGMATEL=y && !CONFIG_SND_HDA_GENERIC

[Takashi Iwai <tiwai@suse.de>]

At Thu, 18 Oct 2007 11:50:42 +0200,
Ingo Molnar wrote:
> 
> 
> fix build bug introduced with the recent sound merge:
> 
> -------------->
> Subject: snd: fix build bug with CONFIG_SND_HDA_CODEC_SIGMATEL=y && !CONFIG_SND_HDA_GENERIC
> From: Ingo Molnar <mingo@elte.hu>
> 
> randconfig build testing found this build bug:
> 
>  sound/built-in.o: In function `patch_stac9872':
>  patch_sigmatel.c:(.text+0x6d6e7): undefined reference to `snd_hda_parse_generic_codec'
> 
> patch_sigmatel.c depends on SND_HDA_GENERIC, for snd_hda_parse_generic_codec().
> 
> to make it selectable, reorder SND_HDA_CODEC_SIGMATEL to after
> SND_HDA_GENERIC.
> 
> with this fixed, the kernel builds fine.
> 
> Signed-off-by: Ingo Molnar <mingo@elte.hu>

Thanks for the patch.
But, I'd like to avoid the reverse selection in that config as much as
possible, which will give messy dependencies.  Is the patch below OK?


Takashi

diff -r fb9512ce24e0 sound/pci/hda/patch_sigmatel.c
--- a/sound/pci/hda/patch_sigmatel.c	Thu Oct 18 10:48:43 2007 +0200
+++ b/sound/pci/hda/patch_sigmatel.c	Thu Oct 18 16:23:22 2007 +0200
@@ -3062,9 +3062,16 @@ static int patch_stac9872(struct hda_cod
 	board_config = snd_hda_check_board_config(codec, STAC_9872_MODELS,
 						  stac9872_models,
 						  stac9872_cfg_tbl);
-	if (board_config < 0)
+	if (board_config < 0) {
+		printk(KERN_WARNING "hda-codec: "
+		       "found unknown STAC9872 device\n");
+#ifdef CONFIG_SND_HDA_GENERIC
 		/* unknown config, let generic-parser do its job... */
 		return snd_hda_parse_generic_codec(codec);
+#else
+		return -ENODEV;
+#endif
+	}
 	
 	spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
 	if (spec == NULL)