From 1904133a936f9ad8192bfc1d90b8ffc8ed3f6486 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 1 Nov 2012 17:30:37 -0700
Subject: [PATCH] --- yaml --- r: 337618 b: refs/heads/master c:
 97641816b58fccaf157ab5093f55f0a319d7a55f h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/addi_apci_3120.c   | 24 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index e5d1c3cc09f5..06628219507c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bb482e25c6c4e5084a0e0847307736bf090adec
+refs/heads/master: 97641816b58fccaf157ab5093f55f0a319d7a55f
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
index 6ca3a3c66139..e87d400df4f0 100644
--- a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -223,7 +223,6 @@ static int apci3120_attach_pci(struct comedi_device *dev,
 
 static void apci3120_detach(struct comedi_device *dev)
 {
-	const struct addi_board *this_board = comedi_board(dev);
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
 	struct addi_private *devpriv = dev->private;
 
@@ -232,20 +231,15 @@ static void apci3120_detach(struct comedi_device *dev)
 			i_APCI3120_Reset(dev);
 		if (dev->irq)
 			free_irq(dev->irq, dev);
-		if ((this_board->pc_EepromChip == NULL) ||
-		    (strcmp(this_board->pc_EepromChip, ADDIDATA_9054) != 0)) {
-			if (devpriv->ul_DmaBufferVirtual[0]) {
-				free_pages((unsigned long)devpriv->
-					ul_DmaBufferVirtual[0],
-					devpriv->ui_DmaBufferPages[0]);
-			}
-			if (devpriv->ul_DmaBufferVirtual[1]) {
-				free_pages((unsigned long)devpriv->
-					ul_DmaBufferVirtual[1],
-					devpriv->ui_DmaBufferPages[1]);
-			}
-		} else {
-			iounmap(devpriv->dw_AiBase);
+		if (devpriv->ul_DmaBufferVirtual[0]) {
+			free_pages((unsigned long)devpriv->
+				ul_DmaBufferVirtual[0],
+				devpriv->ui_DmaBufferPages[0]);
+		}
+		if (devpriv->ul_DmaBufferVirtual[1]) {
+			free_pages((unsigned long)devpriv->
+				ul_DmaBufferVirtual[1],
+				devpriv->ui_DmaBufferPages[1]);
 		}
 	}
 	if (pcidev) {