Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244
Modified Files:
es18xx.c
Log Message:
<[EMAIL PROTECTED]>
This is a *really* silly one. The various probing routines in these
drivers can return -ENODEV, -ENOMEM etc.. so when we do something like
cards += probe_routine()
In some situations we can end up with -13 sound cards, and other
such nonsense. Result : lots of fun oopses.
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- es18xx.c 6 Mar 2004 16:51:29 -0000 1.43
+++ es18xx.c 15 Mar 2004 19:33:52 -0000 1.44
@@ -2232,7 +2232,7 @@
static int __init alsa_card_es18xx_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280, -1};
- int dev, cards = 0;
+ int dev, cards = 0, i;
/* legacy non-auto cards at first */
for (dev = 0; dev < SNDRV_CARDS; dev++) {
@@ -2246,10 +2246,16 @@
cards++;
}
/* legacy auto configured cards */
- cards += snd_legacy_auto_probe(possible_ports,
snd_audiodrive_probe_legacy_port);
+ i = snd_legacy_auto_probe(possible_ports, snd_audiodrive_probe_legacy_port);
+ if (i > 0)
+ cards += i;
+
#ifdef CONFIG_PNP
/* ISA PnP cards at last */
- cards += pnp_register_card_driver(&es18xx_pnpc_driver);
+ i = pnp_register_card_driver(&es18xx_pnpc_driver);
+ if (i > 0)
+ cards += i;
+
#endif
if(!cards) {
#ifdef CONFIG_PNP
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
