mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-09 13:43:21 -04:00
staging: comedi: pcl818: 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: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
281b6e75fd
commit
5d788d019c
@@ -1279,15 +1279,15 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
||||
s->subdev_flags |= SDF_DIFF;
|
||||
}
|
||||
s->maxdata = board->ai_maxdata;
|
||||
s->len_chanlist = s->n_chan;
|
||||
s->range_table = board->ai_range_type;
|
||||
s->cancel = pcl818_ai_cancel;
|
||||
s->insn_read = pcl818_ai_insn_read;
|
||||
if (dev->irq) {
|
||||
dev->read_subdev = s;
|
||||
s->subdev_flags |= SDF_CMD_READ;
|
||||
s->len_chanlist = s->n_chan;
|
||||
s->do_cmdtest = ai_cmdtest;
|
||||
s->do_cmd = ai_cmd;
|
||||
s->cancel = pcl818_ai_cancel;
|
||||
}
|
||||
if (board->is_818) {
|
||||
if ((it->options[4] == 1) || (it->options[4] == 10))
|
||||
|
||||
Reference in New Issue
Block a user