Commit 4ec85dad authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: me4000: remove 'board' from me4000_ai_check_chanlist()

The maximum differential channel is half the subdevice 'n_chan'. Use
that instead and remove the need for the 'board' variable.

Also, the comedi core does no validate the aref flags. Add a check
to ensure that the subdevice actually supports the AREF_DIFF mode.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a023870
...@@ -568,8 +568,6 @@ static int me4000_ai_check_chanlist(struct comedi_device *dev, ...@@ -568,8 +568,6 @@ static int me4000_ai_check_chanlist(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_cmd *cmd) struct comedi_cmd *cmd)
{ {
const struct me4000_board *board = dev->board_ptr;
unsigned int max_diff_chan = board->ai_diff_nchan;
unsigned int aref0 = CR_AREF(cmd->chanlist[0]); unsigned int aref0 = CR_AREF(cmd->chanlist[0]);
int i; int i;
...@@ -585,7 +583,13 @@ static int me4000_ai_check_chanlist(struct comedi_device *dev, ...@@ -585,7 +583,13 @@ static int me4000_ai_check_chanlist(struct comedi_device *dev,
} }
if (aref == AREF_DIFF) { if (aref == AREF_DIFF) {
if (chan >= max_diff_chan) { if (!(s->subdev_flags && SDF_DIFF)) {
dev_err(dev->class_dev,
"Differential inputs are not available\n");
return -EINVAL;
}
if (chan >= (s->n_chan / 2)) {
dev_dbg(dev->class_dev, dev_dbg(dev->class_dev,
"Channel number to high\n"); "Channel number to high\n");
return -EINVAL; return -EINVAL;
......
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