Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1:/tmp/cvs-serv30367/isa
Modified Files:
es18xx.c opl3sa2.c sgalaxy.c sscape.c
Log Message:
- added the error messages for resource allocation failures.
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- es18xx.c 14 Oct 2003 13:08:14 -0000 1.37
+++ es18xx.c 13 Jan 2004 17:11:26 -0000 1.38
@@ -1471,8 +1471,10 @@
chip->ctrl_port = inb(chip->port + 0x05) << 8;
chip->ctrl_port += inb(chip->port + 0x05);
- if ((chip->res_ctrl_port = request_region(chip->ctrl_port, 8, "ES18xx
- CTRL")) == NULL)
+ if ((chip->res_ctrl_port = request_region(chip->ctrl_port, 8, "ES18xx
- CTRL")) == NULL) {
+ snd_printk(KERN_ERR PFX "unable go grab port 0x%lx\n",
chip->ctrl_port);
return -EBUSY;
+ }
return 0;
}
Index: opl3sa2.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- opl3sa2.c 14 Oct 2003 13:08:14 -0000 1.30
+++ opl3sa2.c 13 Jan 2004 17:11:26 -0000 1.31
@@ -236,8 +236,10 @@
card = chip->card;
port = chip->port;
- if ((chip->res_port = request_region(port, 2, "OPL3-SA control")) == NULL)
+ if ((chip->res_port = request_region(port, 2, "OPL3-SA control")) == NULL) {
+ snd_printk(KERN_ERR "opl3sa2: can't grab port 0x%lx\n", port);
return -EBUSY;
+ }
// snd_printk("REG 0A = 0x%x\n", snd_opl3sa2_read(chip, 0x0a));
chip->version = 0;
tmp = snd_opl3sa2_read(chip, OPL3SA2_MISC);
@@ -771,6 +773,7 @@
if ((err = snd_opl3sa2_detect(chip)) < 0)
goto __error;
if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void
*)chip)) {
+ snd_printk(KERN_ERR "opl3sa2: can't grab IRQ %d\n", xirq);
err = -ENODEV;
goto __error;
}
Index: sgalaxy.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sgalaxy.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sgalaxy.c 14 Oct 2003 13:08:14 -0000 1.18
+++ sgalaxy.c 13 Jan 2004 17:11:26 -0000 1.19
@@ -150,8 +150,10 @@
if (tmp < 0)
return -EINVAL;
- if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy",
NULL))
+ if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy",
NULL)) {
+ snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
return -EIO;
+ }
outb(tmp | 0x40, port);
tmp1 = dma_bits[dma % 4];
Index: sscape.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sscape.c 14 Oct 2003 13:08:14 -0000 1.7
+++ sscape.c 13 Jan 2004 17:11:26 -0000 1.8
@@ -1174,6 +1174,7 @@
* can detect and control this hardware ...
*/
if ((io_res = request_region(params->port, 8, "SoundScape")) == NULL) {
+ snd_printk(KERN_ERR "sscape: can't grab port 0x%x\n", params->port);
return -EBUSY;
}
@@ -1181,6 +1182,7 @@
* Grab both DMA channels (OK, only one for now) ...
*/
if ((err = request_dma(params->dma1, "SoundScape")) < 0) {
+ snd_printk(KERN_ERR "sscape: can't grab DMA %d\n", params->dma1);
goto _release_region;
}
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
