Update of /cvsroot/alsa/alsa-kernel/isa/es1688
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244/es1688
Modified Files:
es1688.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: es1688.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- es1688.c 3 Feb 2004 18:48:01 -0000 1.13
+++ es1688.c 15 Mar 2004 19:33:52 -0000 1.14
@@ -182,7 +182,7 @@
static int __init alsa_card_es1688_init(void)
{
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};
- int dev, cards = 0;
+ int dev, cards = 0, i;
for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++) {
if (port[dev] == SNDRV_AUTO_PORT)
@@ -190,7 +190,10 @@
if (snd_audiodrive_probe(dev) >= 0)
cards++;
}
- cards += snd_legacy_auto_probe(possible_ports,
snd_audiodrive_legacy_auto_probe);
+ i = snd_legacy_auto_probe(possible_ports, snd_audiodrive_legacy_auto_probe);
+ if (i > 0)
+ cards += i;
+
if (!cards) {
#ifdef MODULE
printk(KERN_ERR "ESS AudioDrive ES1688 soundcard not found or device
busy\n");
-------------------------------------------------------
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
