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

`apci3120_auto_attach()` 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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 84501a30e377ad3562840c5ca803b9bc85c8f58c..2ac95bab195d3ea3993c3b1829b9a8b1095d2f18 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -100,13 +100,12 @@ static int apci3120_auto_attach(struct comedi_device *dev,
                        if (devpriv->ul_DmaBufferVirtual[i])
                                break;
                }
-               if (devpriv->ul_DmaBufferVirtual[i]) {
-                       devpriv->ui_DmaBufferPages[i] = pages;
-                       devpriv->ui_DmaBufferSize[i] = PAGE_SIZE * pages;
-                       devpriv->ul_DmaBufferHw[i] =
-                               virt_to_bus((void *)devpriv->
-                               ul_DmaBufferVirtual[i]);
-               }
+               if (!devpriv->ul_DmaBufferVirtual[i])
+                       break;
+               devpriv->ui_DmaBufferPages[i] = pages;
+               devpriv->ui_DmaBufferSize[i] = PAGE_SIZE * pages;
+               devpriv->ul_DmaBufferHw[i] =
+                   virt_to_bus(devpriv->ul_DmaBufferVirtual[i]);
        }
        if (!devpriv->ul_DmaBufferVirtual[0])
                devpriv->us_UseDma = 0;