Skip to contentSkip to conversation

New: cs4232, cs4236 module loading problem

Bug 762 Daniel Ritz 2 participants 2 messages Jun 1, 2003 – Jun 2, 2003 Sound

lore
Share & tools
lore

Daniel Ritz

author
#0 lore raw

yaroslav's linux-sound tree has two fixes to cs4236.c, i think they fix the reported oops.

rgds
-daniel

sound/isa/cs423x/cs4236.c +3 -0
@@ -590,6 +590,9 @@
 	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/cs423x/cs4236.c +1 -2
@@ -365,7 +365,6 @@
 			snd_printk(KERN_ERR IDENT " MPU401 PnP manual resources are invalid, using auto config\n");
 		err = pnp_activate_dev(pdev);
 		if (err < 0) {
-			kfree(cfg);
 			printk(KERN_ERR IDENT " MPU401 PnP configure failed for WSS (out of resources?)\n");
 			mpu_port[dev] = SNDRV_AUTO_PORT;
 			mpu_irq[dev] = SNDRV_AUTO_IRQ;

@@ -382,7 +381,7 @@
 	kfree(cfg);
 	return 0;
 }
-#endif
+#endif /* CONFIG_PNP */
 
 static void snd_card_cs4236_free(snd_card_t *card)
 {
#1 lore raw
Quoted 3 lines · Daniel Ritz

yaroslav's linux-sound tree has two fixes to cs4236.c, i think they fix the reported oops.

yes, they do :)
thanks

feketga