leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: adl_pci9118: don't allocate 2nd DMA buffer on failure

Browse Source 
`pci9118_alloc_dma()` tries to allocate two DMA buffers but may allocate
a single buffer or none at all.  If it fails to allocate the first
buffer, it still tries to allocate the second buffer, even though it
won't be used.  Change it to not bother trying to allocate the second
buffer if the first one fails.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2014-09-12 10:04:42 +01:00 committed by Greg Kroah-Hartman
parent 27f5a85fb5
commit d5733baf23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/adl_pci9118.c
View File

@ -1489,16 +1489,16 @@ static void pci9118_alloc_dma(struct comedi_device *dev)
if (dmabuf->virt)
break;
}
if (dmabuf->virt) {
dmabuf->pages = pages;
dmabuf->size = PAGE_SIZE * pages;
dmabuf->hw = virt_to_bus((void *)dmabuf->virt);
if (!dmabuf->virt)
break;
dmabuf->pages = pages;
dmabuf->size = PAGE_SIZE * pages;
dmabuf->hw = virt_to_bus((void *)dmabuf->virt);
if (i == 0)
devpriv->master = 1;
if (i == 1)
devpriv->dma_doublebuf = 1;
}
if (i == 0)
devpriv->master = 1;
if (i == 1)
devpriv->dma_doublebuf = 1;
}
}