From ca38ad7b3934321fc6bf22430b2d67f9c708bea5 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Wed, 18 Jul 2012 19:01:52 -0700
Subject: [PATCH] --- yaml --- r: 318120 b: refs/heads/master c:
 bd8a9bc167483acf21dc291a5860b4d66853e391 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/ke_counter.c       | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 538cb695ff46..d9e7fe89bf5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2a64902e3c2ffa34b52e6ad13e8e3c40f6919c7
+refs/heads/master: bd8a9bc167483acf21dc291a5860b4d66853e391
diff --git a/trunk/drivers/staging/comedi/drivers/ke_counter.c b/trunk/drivers/staging/comedi/drivers/ke_counter.c
index 019e91a9f143..f0b8652a1c47 100644
--- a/trunk/drivers/staging/comedi/drivers/ke_counter.c
+++ b/trunk/drivers/staging/comedi/drivers/ke_counter.c
@@ -122,18 +122,12 @@ static int cnt_rinsn(struct comedi_device *dev,
 	return 1;
 }
 
-static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+static struct pci_dev *cnt_find_pci_dev(struct comedi_device *dev,
+					struct comedi_devconfig *it)
 {
-	struct comedi_subdevice *subdevice;
-	struct pci_dev *pci_device = NULL;
 	struct cnt_board_struct *board;
-	unsigned long io_base;
-	int error, i;
-
-	/* allocate device private structure */
-	error = alloc_private(dev, sizeof(struct cnt_device_private));
-	if (error < 0)
-		return error;
+	struct pci_dev *pci_device = NULL;
+	int i;
 
 	/* Probe the device to determine what device in the series it is. */
 	for_each_pci_dev(pci_device) {
@@ -166,14 +160,35 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	printk(KERN_WARNING
 	       "comedi%d: no supported board found! (req. bus/slot: %d/%d)\n",
 	       dev->minor, it->options[0], it->options[1]);
-	return -EIO;
+	return NULL;
 
 found:
 	printk(KERN_INFO
 	       "comedi%d: found %s at PCI bus %d, slot %d\n", dev->minor,
 	       board->name, pci_device->bus->number,
 	       PCI_SLOT(pci_device->devfn));
+	return pci_device;
+}
+
+static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
+{
+	struct pci_dev *pci_device;
+	struct comedi_subdevice *subdevice;
+	struct cnt_board_struct *board;
+	unsigned long io_base;
+	int error;
+
+	/* allocate device private structure */
+	error = alloc_private(dev, sizeof(struct cnt_device_private));
+	if (error < 0)
+		return error;
+
+	pci_device = cnt_find_pci_dev(dev, it);
+	if (!pci_device)
+		return -EIO;
 	devpriv->pcidev = pci_device;
+	board = (struct cnt_board_struct *)dev->board_ptr;
+
 	dev->board_name = board->name;
 
 	/* enable PCI device and request regions */