From 15d181daca3e3fc3d0992d7ec0100f5802c14222 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 24 Sep 2012 13:23:57 -0700
Subject: [PATCH] --- yaml --- r: 325533 b: refs/heads/master c:
 b7047895b9c9deee0b0f4cb2a0a788c189f985f2 h: refs/heads/master i:   325531:
 e783f8d84f368fcae3e4352eeb25926d21337836 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/comedi/drivers/s626.c | 57 +++++++++++----------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 01c64a024cf5..99ef2e2b2bfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97d87e00e3d6bdc8f3de606dd7cc5aa149709435
+refs/heads/master: b7047895b9c9deee0b0f4cb2a0a788c189f985f2
diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c
index a9d78c721403..61bb8ab05786 100644
--- a/trunk/drivers/staging/comedi/drivers/s626.c
+++ b/trunk/drivers/staging/comedi/drivers/s626.c
@@ -2437,6 +2437,33 @@ static void CountersInit(struct comedi_device *dev)
 	}
 }
 
+static int s626_allocate_dma_buffers(struct comedi_device *dev)
+{
+	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+	void *addr;
+	dma_addr_t appdma;
+
+	devpriv->allocatedBuf = 0;
+
+	addr = pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
+	if (!addr)
+		return -ENOMEM;
+	devpriv->ANABuf.LogicalBase = addr;
+	devpriv->ANABuf.PhysicalBase = appdma;
+
+	devpriv->allocatedBuf++;
+
+	addr = pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
+	if (!addr)
+		return -ENOMEM;
+	devpriv->RPSBuf.LogicalBase = addr;
+	devpriv->RPSBuf.PhysicalBase = appdma;
+
+	devpriv->allocatedBuf++;
+
+	return 0;
+}
+
 static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 {
 /*   uint8_t	PollList; */
@@ -2446,7 +2473,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 /*   unsigned int data[16]; */
 	int i;
 	int ret;
-	dma_addr_t appdma;
 	struct comedi_subdevice *s;
 
 	comedi_set_hw_dev(dev, &pcidev->dev);
@@ -2473,32 +2499,9 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 
 	/* DMA FIXME DMA// */
 
-	/* adc buffer allocation */
-	devpriv->allocatedBuf = 0;
-
-	devpriv->ANABuf.LogicalBase =
-		pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
-
-	if (devpriv->ANABuf.LogicalBase == NULL) {
-		printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
-		return -ENOMEM;
-	}
-
-	devpriv->ANABuf.PhysicalBase = appdma;
-
-	devpriv->allocatedBuf++;
-
-	devpriv->RPSBuf.LogicalBase =
-		pci_alloc_consistent(pcidev, DMABUF_SIZE, &appdma);
-
-	if (devpriv->RPSBuf.LogicalBase == NULL) {
-		printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
-		return -ENOMEM;
-	}
-
-	devpriv->RPSBuf.PhysicalBase = appdma;
-
-	devpriv->allocatedBuf++;
+	ret = s626_allocate_dma_buffers(dev);
+	if (ret)
+		return ret;
 
 	ret = comedi_alloc_subdevices(dev, 6);
 	if (ret)