patch-1.3.36 linux/drivers/sound/trix.c
Next file: linux/fs/Config.in
Previous file: linux/drivers/sound/sys_timer.c
Back to the patch index
Back to the overall index
- Lines: 45
- Date:
Wed Oct 18 05:33:27 1995
- Orig file:
v1.3.35/linux/drivers/sound/trix.c
- Orig date:
Fri Oct 13 14:44:44 1995
diff -u --recursive --new-file v1.3.35/linux/drivers/sound/trix.c linux/drivers/sound/trix.c
@@ -353,13 +353,22 @@
{-1, -1, -1, 1, 2, 3, -1, 4, -1, 5};
if (!kilroy_was_here)
- return 0; /* AudioTriX Pro has not been detected earlier */
+ {
+ DDB (printk ("Trix: WSS and SB modes must be initialized before MPU\n"));
+ return 0; /* AudioTriX Pro has not been detected earlier */
+ }
if (!sb_initialized)
- return 0;
+ {
+ DDB (printk ("Trix: SB mode must be initialized before MPU\n"));
+ return 0;
+ }
if (mpu_initialized)
- return 0;
+ {
+ DDB (printk ("Trix: MPU mode already initialized\n"));
+ return 0;
+ }
if (check_region (hw_config->io_base, 4))
{
@@ -368,10 +377,16 @@
}
if (hw_config->irq > 9)
- return 0;
+ {
+ printk ("AudioTriX: Bad MPU IRQ %d\n", hw_config->irq);
+ return 0;
+ }
if (irq_bits[hw_config->irq] == -1)
- return 0;
+ {
+ printk ("AudioTriX: Bad MPU IRQ %d\n", hw_config->irq);
+ return 0;
+ }
switch (hw_config->io_base)
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this