From a2b0dd331121ffc78d49b9d9edfd17036faa6771 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Thu, 31 May 2012 14:08:35 +0100
Subject: [PATCH] --- yaml --- r: 317151 b: refs/heads/master c:
 181ad5edbf6d3c244263b770e9dd4eda645de5bf h: refs/heads/master i:   317149:
 6b033aba6f7e490f2d88d206452eb8b384bef99f   317147:
 57361236dfbb3854787910ed595825697030e300   317143:
 62ca9d59a557f588fd59c54042e9fb689da82043   317135:
 b672e344e6deb89470391c04329a7294d84efbfc   317119:
 cea8c0563bbbd68c1966429ea1e576252d340bcd v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/amplc_dio200.c     | 20 ++++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 570801e524c2..664556995a4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485455d01b26e849d30c2b20ce20a4d6fc50555e
+refs/heads/master: 181ad5edbf6d3c244263b770e9dd4eda645de5bf
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
index be932e88895a..6d04378f553f 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -463,14 +463,11 @@ struct dio200_subdev_intr {
  * This function looks for a PCI device matching the requested board name,
  * bus and slot.
  */
-static int
-dio200_find_pci(struct comedi_device *dev, int bus, int slot,
-		struct pci_dev **pci_dev_p)
+static struct pci_dev *
+dio200_find_pci(struct comedi_device *dev, int bus, int slot)
 {
 	struct pci_dev *pci_dev = NULL;
 
-	*pci_dev_p = NULL;
-
 	/* Look for matching PCI device. */
 	for (pci_dev = pci_get_device(PCI_VENDOR_ID_AMPLICON, PCI_ANY_ID, NULL);
 	     pci_dev != NULL;
@@ -504,8 +501,7 @@ dio200_find_pci(struct comedi_device *dev, int bus, int slot,
 		}
 
 		/* Found a match. */
-		*pci_dev_p = pci_dev;
-		return 0;
+		return pci_dev;
 	}
 	/* No match found. */
 	if (bus || slot) {
@@ -516,7 +512,7 @@ dio200_find_pci(struct comedi_device *dev, int bus, int slot,
 		dev_err(dev->class_dev, "error! no %s found!\n",
 			thisboard->name);
 	}
-	return -EIO;
+	return NULL;
 }
 
 /*
@@ -1293,15 +1289,15 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 			return ret;
 	} else if (IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI) &&
 		   thisboard->bustype == pci_bustype) {
-		struct pci_dev *pci_dev = NULL;
+		struct pci_dev *pci_dev;
 		int bus, slot;
 
 		bus = it->options[0];
 		slot = it->options[1];
 		share_irq = 1;
-		ret = dio200_find_pci(dev, bus, slot, &pci_dev);
-		if (ret < 0)
-			return ret;
+		pci_dev = dio200_find_pci(dev, bus, slot);
+		if (pci_dev == NULL)
+			return -EIO;
 		devpriv->pci_dev = pci_dev;
 		ret = comedi_pci_enable(pci_dev, DIO200_DRIVER_NAME);
 		if (ret < 0) {