Merge suse.cz:/home/perex/bk/linux-sound/linux-2.5

into suse.cz:/home/perex/bk/linux-sound/linux-sound

include/sound/version.h

 /* include/version.h.  Generated by configure.  */
 #define CONFIG_SND_VERSION "0.9.2"
-#define CONFIG_SND_DATE " (Thu Mar 20 13:31:57 2003 UTC)"
+#define CONFIG_SND_DATE " (Fri Apr 11 07:44:21 2003 UTC)"

sound/isa/ad1816a/ad1816a.c

@@ -307,8 +307,10 @@ static int __init alsa_card_ad1816a_init(void)
 
 	cards += pnp_register_card_driver(&ad1816a_pnpc_driver);
 #ifdef MODULE
-	if (!cards)
+	if (!cards) {
+		pnp_unregister_card_driver(&ad1816a_pnpc_driver);
 		printk(KERN_ERR "no AD1816A based soundcards found.\n");
+	}
 #endif	/* MODULE */
 	return cards ? 0 : -ENODEV;
 }

sound/isa/als100.c

@@ -328,8 +328,10 @@ static int __init alsa_card_als100_init(void)
 
 	cards += pnp_register_card_driver(&als100_pnpc_driver);
 #ifdef MODULE
-	if (!cards)
+	if (!cards) {
+		pnp_unregister_card_driver(&als100_pnpc_driver);
 		snd_printk(KERN_ERR "no ALS100 based soundcards found\n");
+	}
 #endif
 	return cards ? 0 : -ENODEV;
 }

sound/isa/azt2320.c

@@ -365,8 +365,10 @@ static int __init alsa_card_azt2320_init(void)
 
 	cards += pnp_register_card_driver(&azt2320_pnpc_driver);
 #ifdef MODULE
-	if (!cards)
+	if (!cards) {
+		pnp_unregister_card_driver(&azt2320_pnpc_driver);
 		snd_printk(KERN_ERR "no AZT2320 based soundcards found\n");
+	}
 #endif
 	return cards ? 0 : -ENODEV;
 }

sound/isa/cmi8330.c

@@ -613,6 +613,9 @@ static int __init alsa_card_cmi8330_init(void)
 #endif
 
 	if (!cards) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&cmi8330_pnpc_driver);
+#endif
 #ifdef MODULE
 		snd_printk(KERN_ERR "CMI8330 not found or device busy\n");
 #endif

sound/isa/cs423x/cs4236.c

@@ -590,6 +590,9 @@ static int __init alsa_card_cs423x_init(void)
 	cards += pnp_register_card_driver(&cs423x_pnpc_driver);
 #endif
 	if (!cards) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&cs423x_pnpc_driver);
+#endif
 #ifdef MODULE
 		printk(KERN_ERR IDENT " soundcard not found or device busy\n");
 #endif

sound/isa/es18xx.c

@@ -2242,6 +2242,9 @@ static int __init alsa_card_es18xx_init(void)
 	cards += pnp_register_card_driver(&es18xx_pnpc_driver);
 #endif
 	if(!cards) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&es18xx_pnpc_driver);
+#endif
 #ifdef MODULE
 		snd_printk(KERN_ERR "ESS AudioDrive ES18xx soundcard not found or device busy\n");
 #endif

sound/isa/gus/interwave.c

@@ -949,6 +949,9 @@ static int __init alsa_card_interwave_init(void)
 #endif
 
 	if (!cards) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&interwave_pnpc_driver);
+#endif
 #ifdef MODULE
 		printk(KERN_ERR "InterWave soundcard not found or device busy\n");
 #endif

sound/isa/opl3sa2.c

@@ -902,6 +902,9 @@ static int __init alsa_card_opl3sa2_init(void)
 	if (!cards) {
 #ifdef MODULE
 		snd_printk(KERN_ERR "Yamaha OPL3-SA soundcard not found or device busy\n");
+#endif
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&opl3sa2_pnpc_driver);
 #endif
 		return -ENODEV;
 	}

sound/isa/opti9xx/opti92x-ad1848.c

@@ -1946,7 +1946,7 @@ static int __devinit snd_card_opti9xx_probe(struct pnp_card_link *pcard,
 	chip = (opti9xx_t *)card->private_data;
 
 #ifdef CONFIG_PNP
-	if (isapnp && (hw = snd_card_opti9xx_pnp(chip, pcard, pid)) > 0) {
+	if (isapnp && pcard && (hw = snd_card_opti9xx_pnp(chip, pcard, pid)) > 0) {
 		switch (hw) {
 		case 0x0924:
 			hw = OPTi9XX_HW_82C924;
@@ -2203,6 +2203,9 @@ static int __init alsa_card_opti9xx_init(void)
 
 	cards = pnp_register_card_driver(&opti9xx_pnpc_driver);
 	if (cards == 0 && (error = snd_card_opti9xx_probe(NULL, NULL)) < 0) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&opti9xx_pnpc_driver);
+#endif
 #ifdef MODULE
 #ifdef OPTi93X
 		printk(KERN_ERR "no OPTi 82C93x soundcard found\n");

sound/isa/sb/es968.c

@@ -225,10 +225,13 @@ static struct pnp_card_driver es968_pnpc_driver = {
 static int __init alsa_card_es968_init(void)
 {
 	int res = pnp_register_card_driver(&es968_pnpc_driver);
-#ifdef MODULE
 	if (res == 0)
+	{
+		pnp_unregister_card_driver(&es968_pnpc_driver);
+#ifdef MODULE
 		snd_printk(KERN_ERR "no ES968 based soundcards found\n");
 #endif
+	}
 	return res < 0 ? res : 0;
 }
 

sound/isa/sb/sb16.c

@@ -625,6 +625,9 @@ static int __init alsa_card_sb16_init(void)
 #endif
 
 	if (!cards) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&sb16_pnpc_driver);
+#endif
 #ifdef MODULE
 		snd_printk(KERN_ERR "Sound Blaster 16 soundcard not found or device busy\n");
 #ifdef SNDRV_SBAWE_EMU8000

sound/isa/wavefront/wavefront.c

@@ -710,6 +710,9 @@ static int __init alsa_card_wavefront_init(void)
 	cards += pnp_register_card_driver(&wavefront_pnpc_driver);
 #endif
 	if (!cards) {
+#ifdef CONFIG_PNP
+		pnp_unregister_card_driver(&wavefront_pnpc_driver);
+#endif
 #ifdef MODULE
 		printk (KERN_ERR "No WaveFront cards found or devices busy\n");
 #endif
@@ -722,7 +725,9 @@ static void __exit alsa_card_wavefront_exit(void)
 {
 	int idx;
 
+#ifdef CONFIG_PNP
 	pnp_unregister_card_driver(&wavefront_pnpc_driver);
+#endif
 	for (idx = 0; idx < SNDRV_CARDS; idx++)
 		snd_card_free(snd_wavefront_legacy[idx]);
 }