---

yaml --- r: 337611 b: refs/heads/master c: aea9c4e h: refs/heads/master i: 337609: 3629a77 337607: ed9feac v: v3
git-mirror · Nov 2, 2012 · 8a4ba9c · 8a4ba9c
1 parent 06a3047
commit 8a4ba9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f538c37ded4b33765cc942b1e2e64f1504db4101
+refs/heads/master: aea9c4e284a10f7154ecc4af50d0a2778053aacb
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -88,7 +88,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
 	const struct addi_board *this_board;
 	struct addi_private *devpriv;
 	struct comedi_subdevice *s;
-	int ret, pages, i, n_subdevices;
+	int ret, pages, i;
 
 	this_board = addi_find_boardinfo(dev, pcidev);
 	if (!this_board)
@@ -151,8 +151,7 @@ static int apci3120_attach_pci(struct comedi_device *dev,
 	if (devpriv->ul_DmaBufferVirtual[1])
 		devpriv->b_DmaDoubleBuffer = 1;
 
-	n_subdevices = 7;
-	ret = comedi_alloc_subdevices(dev, n_subdevices);
+	ret = comedi_alloc_subdevices(dev, 5);
 	if (ret)
 		return ret;
 
@@ -239,14 +238,6 @@ static int apci3120_attach_pci(struct comedi_device *dev,
 	s->insn_read = i_APCI3120_InsnReadTimer;
 	s->insn_config = i_APCI3120_InsnConfigTimer;
 
-	/*  Allocate and Initialise TTL */
-	s = &dev->subdevices[5];
-	s->type = COMEDI_SUBD_UNUSED;
-
-	/* EEPROM */
-	s = &dev->subdevices[6];
-	s->type = COMEDI_SUBD_UNUSED;
-
 	i_APCI3120_Reset(dev);
 	return 0;
 }