]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: adl_pci9118: don't allocate 2nd DMA buffer on failure
authorIan Abbott <abbotti@mev.co.uk>
Fri, 12 Sep 2014 09:04:42 +0000 (10:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Sep 2014 22:36:24 +0000 (15:36 -0700)
`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>
drivers/staging/comedi/drivers/adl_pci9118.c

index 8d3f81322eae68c9c93f9b6ee04f6d643b49cb52..116910401067f3ca83f0d1ab9ed14923d812c467 100644 (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 (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;
        }
 }