patch-2.4.3 linux/drivers/sound/awe_wave.c
Next file: linux/drivers/sound/cs46xx.c
Previous file: linux/drivers/sound/Config.in
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
Fri Mar 2 11:12:11 2001
- Orig file:
v2.4.2/linux/drivers/sound/awe_wave.c
- Orig date:
Wed Feb 21 18:20:34 2001
diff -u --recursive --new-file v2.4.2/linux/drivers/sound/awe_wave.c linux/drivers/sound/awe_wave.c
@@ -206,7 +206,7 @@
int io = AWE_DEFAULT_BASE_ADDR; /* Emu8000 base address */
int memsize = AWE_DEFAULT_MEM_SIZE; /* memory size in Kbytes */
#if defined CONFIG_ISAPNP || defined CONFIG_ISAPNP_MODULE
-static int isapnp = 1;
+static int isapnp = -1;
#else
static int isapnp = 0;
#endif
@@ -4843,10 +4843,12 @@
if (isapnp) {
if (awe_probe_isapnp(&io) < 0) {
printk(KERN_ERR "AWE32: No ISAPnP cards found\n");
- return 0;
+ if (isapnp != -1)
+ return 0;
+ } else {
+ setup_ports(io, 0, 0);
+ return 1;
}
- setup_ports(io, 0, 0);
- return 1;
}
#endif /* isapnp */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)