[PATCH 4/9] staging: comedi: addi_apci_1564: board has 4 timers

H Hartley Sweeten hsweeten at visionengravers.com
Mon Oct 20 17:58:00 UTC 2014


Now that the timer 'channels' are handled correctly in the subdevice functions,
fix the number of timer channels. The APCI-1564 has 4 timers.

Also, remove the unnecessary initialzation of the subdevice 'len_chanlist'. That
member is only used by subdevices that support async commands.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/addi_apci_1564.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 53f630b..23a98b9 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -437,9 +437,8 @@ static int apci1564_auto_attach(struct comedi_device *dev,
 	s = &dev->subdevices[3];
 	s->type		= COMEDI_SUBD_TIMER;
 	s->subdev_flags	= SDF_WRITEABLE;
-	s->n_chan	= 1;
+	s->n_chan	= 4;
 	s->maxdata	= 0;
-	s->len_chanlist	= 1;
 	s->range_table	= &range_digital;
 	s->insn_write	= apci1564_timer_write;
 	s->insn_read	= apci1564_timer_read;
-- 
2.0.3



More information about the devel mailing list