Commit 12f24996 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl812: only init async command members when needed

The 'len_chanlist' and 'cancel' members of the comedi_subdevice are
only used with async command support. Only initialize them if the irq
was sucessfully requested.
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 e5fc1a19
...@@ -1201,7 +1201,6 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1201,7 +1201,6 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
break; break;
} }
s->maxdata = board->ai_maxdata; s->maxdata = board->ai_maxdata;
s->len_chanlist = MAX_CHANLIST_LEN;
s->range_table = board->rangelist_ai; s->range_table = board->rangelist_ai;
if (board->board_type == boardACL8216) if (board->board_type == boardACL8216)
s->insn_read = acl8216_ai_insn_read; s->insn_read = acl8216_ai_insn_read;
...@@ -1209,13 +1208,14 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1209,13 +1208,14 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_read = pcl812_ai_insn_read; s->insn_read = pcl812_ai_insn_read;
devpriv->use_MPC = board->haveMPC508; devpriv->use_MPC = board->haveMPC508;
s->cancel = pcl812_ai_cancel;
if (dev->irq) { if (dev->irq) {
dev->read_subdev = s; dev->read_subdev = s;
s->subdev_flags |= SDF_CMD_READ; s->subdev_flags |= SDF_CMD_READ;
s->len_chanlist = MAX_CHANLIST_LEN;
s->do_cmdtest = pcl812_ai_cmdtest; s->do_cmdtest = pcl812_ai_cmdtest;
s->do_cmd = pcl812_ai_cmd; s->do_cmd = pcl812_ai_cmd;
s->poll = pcl812_ai_poll; s->poll = pcl812_ai_poll;
s->cancel = pcl812_ai_cancel;
} }
switch (board->board_type) { switch (board->board_type) {
case boardPCL812PG: case boardPCL812PG:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment