Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv16068/pci/ice1712
Modified Files:
ice1712.c ice1724.c
Log Message:
fixed the wrong order of object destruction:
a released object is referred after the *_free() call.
Index: ice1712.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1712.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ice1712.c 12 Aug 2003 14:10:15 -0000 1.32
+++ ice1712.c 14 Aug 2003 11:05:38 -0000 1.33
@@ -2387,28 +2387,28 @@
synchronize_irq(pci->irq);
if ((ice->res_port = request_region(ice->port, 32, "ICE1712 - Controller")) ==
NULL) {
- snd_ice1712_free(ice);
snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->port, ice->port
+ 32 - 1);
+ snd_ice1712_free(ice);
return -EIO;
}
if ((ice->res_ddma_port = request_region(ice->ddma_port, 16, "ICE1712 -
DDMA")) == NULL) {
- snd_ice1712_free(ice);
snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->ddma_port,
ice->ddma_port + 16 - 1);
+ snd_ice1712_free(ice);
return -EIO;
}
if ((ice->res_dmapath_port = request_region(ice->dmapath_port, 16, "ICE1712 -
DMA path")) == NULL) {
- snd_ice1712_free(ice);
snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->dmapath_port,
ice->dmapath_port + 16 - 1);
+ snd_ice1712_free(ice);
return -EIO;
}
if ((ice->res_profi_port = request_region(ice->profi_port, 64, "ICE1712 -
Professional")) == NULL) {
- snd_ice1712_free(ice);
snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->profi_port,
ice->profi_port + 16 - 1);
+ snd_ice1712_free(ice);
return -EIO;
}
if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ,
"ICE1712", (void *) ice)) {
- snd_ice1712_free(ice);
snd_printk("unable to grab IRQ %d\n", pci->irq);
+ snd_ice1712_free(ice);
return -EIO;
}
Index: ice1724.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1724.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ice1724.c 12 Aug 2003 14:10:15 -0000 1.14
+++ ice1724.c 14 Aug 2003 11:05:38 -0000 1.15
@@ -1796,20 +1796,20 @@
synchronize_irq(pci->irq);
if ((ice->res_port = request_region(ice->port, 32, "ICE1724 - Controller")) ==
NULL) {
- snd_vt1724_free(ice);
snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->port, ice->port
+ 32 - 1);
+ snd_vt1724_free(ice);
return -EIO;
}
if ((ice->res_profi_port = request_region(ice->profi_port, 128, "ICE1724 -
Professional")) == NULL) {
- snd_vt1724_free(ice);
snd_printk("unable to grab ports 0x%lx-0x%lx\n", ice->profi_port,
ice->profi_port + 16 - 1);
+ snd_vt1724_free(ice);
return -EIO;
}
if (request_irq(pci->irq, snd_vt1724_interrupt, SA_INTERRUPT|SA_SHIRQ,
"ICE1724", (void *) ice)) {
- snd_vt1724_free(ice);
snd_printk("unable to grab IRQ %d\n", pci->irq);
+ snd_vt1724_free(ice);
return -EIO;
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
