From: Ian Abbott Date: Fri, 12 Sep 2014 11:19:54 +0000 (+0100) Subject: staging: comedi: addi_apci_3120: don't allocate 2nd DMA buffer on failure X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df567feb00277ddee715f61e4616eaae50532ea0;p=linux-beck.git 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index 84501a30e377..2ac95bab195d 100644 --- 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;