Generated in 2.6.13-mm1 kernel version.
Signed-off-by: Jiri Slaby <[EMAIL PROTECTED]> memalloc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -567,8 +567,8 @@ static int snd_mem_proc_write(struct fil char *endp; int vendor, device, size, buffers; long mask; - int i, alloced; - struct pci_dev *pci; + int i, alloced = 0; + struct pci_dev *pci = NULL; if ((token = gettoken(&p)) == NULL || (vendor = simple_strtol(token, NULL, 0)) <= 0 || @@ -588,13 +588,12 @@ static int snd_mem_proc_write(struct fil vendor &= 0xffff; device &= 0xffff; - alloced = 0; - pci = NULL; - while ((pci = pci_find_device(vendor, device, pci)) != NULL) { + while ((pci = pci_get_device(vendor, device, pci)) != NULL) { if (mask > 0 && mask < 0xffffffff) { if (pci_set_dma_mask(pci, mask) < 0 || pci_set_consistent_dma_mask(pci, mask) < 0) { printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", mask, vendor, device); + pci_dev_put(pci); return (int)count; } } @@ -604,6 +603,7 @@ static int snd_mem_proc_write(struct fil if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), size, &dmab) < 0) { printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size); + pci_dev_put(pci); return (int)count; } snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci)); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/