diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2014-09-12 10:04:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-19 15:36:24 -0700 |
| commit | d5733baf238533e9df41d92948e1ace5e0eae1de (patch) | |
| tree | ea1fad901c07cd3e2cd8ffcff65b3b4a27bb413e /drivers/staging/comedi/drivers/adl_pci9118.c | |
| parent | 27f5a85fb535296ebaa8334627774f0201df8a11 (diff) | |
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 <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/adl_pci9118.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9118.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 8d3f81322eae..116910401067 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; } } |