Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df567feb authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

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: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aee44756

drivers/staging/comedi/drivers/addi_apci_3120.c

+6 −7
Original line number Diff line number Diff line
@@ -100,13 +100,12 @@ static int apci3120_auto_attach(struct comedi_device *dev, 
			if (devpriv->ul_DmaBufferVirtual[i])

				break;

		}

		if (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((void *)devpriv->

				ul_DmaBufferVirtual[i]);

		}

		    virt_to_bus(devpriv->ul_DmaBufferVirtual[i]);

	}

	if (!devpriv->ul_DmaBufferVirtual[0])

		devpriv->us_UseDma = 0;