Re: [Bug 762] New: cs4232, cs4236 module loading problem

From: Daniel Ritz (daniel.ritz@gmx.ch)
Date: Sun Jun 01 2003 - 11:56:34 EST


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

rgds
-daniel

--- 1.14/sound/isa/cs423x/cs4236.c Thu Apr 10 03:28:11 2003
+++ 1.15/sound/isa/cs423x/cs4236.c Fri Apr 11 04:37:55 2003
@@ -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

--- 1.15/sound/isa/cs423x/cs4236.c Fri Apr 11 04:37:55 2003
+++ 1.16/sound/isa/cs423x/cs4236.c Tue May 20 14:13:00 2003
@@ -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)
 {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jun 07 2003 - 22:00:14 EST