Update of /cvsroot/alsa/alsa-driver/pci/pdplus In directory sc8-pr-cvs1:/tmp/cvs-serv1333
Modified Files: pdplus.c Log Message: fixed memory leaks and non-initialized irq. Index: pdplus.c =================================================================== RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/pdplus.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pdplus.c 12 Aug 2003 15:32:30 -0000 1.13 +++ pdplus.c 25 Sep 2003 09:58:28 -0000 1.14 @@ -1464,8 +1464,10 @@ if (mem) { if (mem->vaddr) iounmap((void *) (mem->vaddr & PAGE_MASK)); - if (mem->resource) + if (mem->resource) { release_resource(mem->resource); + kfree_nocheck(mem->resource); + } } } @@ -5957,6 +5959,7 @@ scard->pci = pci; scard->card = card; + scard->irq = -1; /* Set up variables which are possibly non-null at start-up. */ /* *INIT* */ @@ -6012,6 +6015,7 @@ snd_printk ("Unable to grab interrupt %d.\n", pci->irq); return -EBUSY; } + scard->irq = pci->irq; /* Register io memory */ if ((err = pdplus_register_iomem (card, pci, 2, 0x20000, &scard->MEM_iomem, FULL_NAME " - MEM")) < 0) @@ -6084,7 +6088,7 @@ pci_dev_t *pci, pci_device_id_t const *pci_id) { - static int __initdata dev = 0; + static int dev = 0; int err; snd_card_t *card; ENTER; @@ -6154,8 +6158,10 @@ pdplus_unregister_iomem (&scard->FPGA_iomem); pdplus_unregister_iomem (&scard->HW_iomem); - if (scard->res_PLX_io) + if (scard->res_PLX_io) { release_resource(scard->res_PLX_io); + kfree_nocheck(scard->res_PLX_io); + } if (scard->irq >= 0) free_irq(scard->irq, (void *)scard); ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog