From 5b468432b42548025fdc7dc898fdad6ac9ccc5ec Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 14 Sep 2012 17:34:26 +0100
Subject: [PATCH] --- yaml --- r: 325311 b: refs/heads/master c:
 6dc71205fc2e87ff68f5d60ffe632013587bc26c h: refs/heads/master i:   325309:
 4887c00f69d78ad9065380dab4b8f09b86145392   325307:
 16f584890a7b7146a9798c577dd5658b5b133a55   325303:
 485e897b97c6951aabde09d9a702113000a9e217   325295:
 8eeb38f2d5e463957cdeb1c9b225cf077c5dd009   325279:
 0abeff663da5a59d133f56780e9bd475b612210a   325247:
 2806517d2c7d97c6e88357aebf7afb1a32bb9e03 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/comedi/drivers/ni_6527.c  | 22 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index cf10024d9850..ded4c7eb092c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca8eb8d5c8aa1a0828d381b213b14e13961f5297
+refs/heads/master: 6dc71205fc2e87ff68f5d60ffe632013587bc26c
diff --git a/trunk/drivers/staging/comedi/drivers/ni_6527.c b/trunk/drivers/staging/comedi/drivers/ni_6527.c
index 170edb75fbe2..8125d5069899 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_6527.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_6527.c
@@ -353,20 +353,6 @@ static int ni6527_intr_insn_config(struct comedi_device *dev,
 	return 2;
 }
 
-/* FIXME: remove this when dynamic MITE allocation implemented. */
-static struct mite_struct *ni6527_find_mite(struct pci_dev *pcidev)
-{
-	struct mite_struct *mite;
-
-	for (mite = mite_devices; mite; mite = mite->next) {
-		if (mite->used)
-			continue;
-		if (mite->pcidev == pcidev)
-			return mite;
-	}
-	return NULL;
-}
-
 static const struct ni6527_board *
 ni6527_find_boardinfo(struct pci_dev *pcidev)
 {
@@ -395,9 +381,9 @@ static int __devinit ni6527_attach_pci(struct comedi_device *dev,
 	if (!dev->board_ptr)
 		return -ENODEV;
 
-	devpriv->mite = ni6527_find_mite(pcidev);
+	devpriv->mite = mite_alloc(pcidev);
 	if (!devpriv->mite)
-		return -ENODEV;
+		return -ENOMEM;
 
 	ret = mite_setup(devpriv->mite);
 	if (ret < 0) {
@@ -468,8 +454,10 @@ static void ni6527_detach(struct comedi_device *dev)
 		       devpriv->mite->daq_io_addr + Master_Interrupt_Control);
 	if (dev->irq)
 		free_irq(dev->irq, dev);
-	if (devpriv && devpriv->mite)
+	if (devpriv && devpriv->mite) {
 		mite_unsetup(devpriv->mite);
+		mite_free(devpriv->mite);
+	}
 }
 
 static struct comedi_driver ni6527_driver = {