From d5733baf238533e9df41d92948e1ace5e0eae1de Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 12 Sep 2014 10:04:42 +0100 Subject: [PATCH] staging: comedi: adl_pci9118: don't allocate 2nd DMA buffer on failure `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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adl_pci9118.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 8d3f813..1169104 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -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 (i == 0) - devpriv->master = 1; - if (i == 1) - devpriv->dma_doublebuf = 1; - } + 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; } } -- 2.7.4