From 58d66fc394d92c16c98d671d07f0d752844d64ec Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 16 Aug 2012 19:50:42 -0700
Subject: [PATCH] --- yaml --- r: 324590 b: refs/heads/master c:
 4d928b176a7e9c59a54a3d48fa16f9421dea0ad8 h: refs/heads/master v: v3

---
 [refs]                                           |  2 +-
 .../drivers/staging/comedi/drivers/cb_pcimdda.c  | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index dfff21d575e3..eb1666ef03dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e070c6a949c4b7f0ebe73a08ff4df422b0d95216
+refs/heads/master: 4d928b176a7e9c59a54a3d48fa16f9421dea0ad8
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
index f658cff19f40..bf98af450f0e 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -101,7 +101,6 @@ struct cb_pcimdda_board {
 	unsigned short device_id;
 	int ao_chans;
 	int ao_bits;
-	int dio_chans;
 	/* how many bytes into the BADR are the DIO ports */
 	int dio_offset;
 	int regs_badrindex;	/* IO Region for the control, analog output,
@@ -115,7 +114,6 @@ static const struct cb_pcimdda_board cb_pcimdda_boards[] = {
 	 .device_id = PCI_ID_PCIM_DDA06_16,
 	 .ao_chans = 6,
 	 .ao_bits = 16,
-	 .dio_chans = 24,
 	 .dio_offset = 12,
 	 .regs_badrindex = 3,
 	 .reg_sz = 16,
@@ -274,15 +272,11 @@ static int cb_pcimdda_attach(struct comedi_device *dev,
 
 	s = dev->subdevices + 1;
 	/* digital i/o subdevice */
-	if (thisboard->dio_chans) {
-		ret = subdev_8255_init(dev, s, NULL,
-				dev->iobase + thisboard->dio_offset);
-		if (ret)
-			return ret;
-		devpriv->attached_to_8255 = 1;
-	} else {
-		s->type = COMEDI_SUBD_UNUSED;
-	}
+	ret = subdev_8255_init(dev, s, NULL,
+			dev->iobase + thisboard->dio_offset);
+	if (ret)
+		return ret;
+	devpriv->attached_to_8255 = 1;
 
 	dev_info(dev->class_dev, "%s attached\n", dev->board_name);