Commit aea9c4e2 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_3120: fix the number of subdevices 



The addi-data "common" code always allocates 7 subdevices. This
driver is now separate from that code so we can remove the unused
subdevices.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f538c37d

drivers/staging/comedi/drivers/addi_apci_3120.c

+2 −11
Original line number Diff line number Diff line
@@ -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;

}