Commit 7c999314 authored Oct 19, 2015 by H Hartley Sweeten Committed by Greg Kroah-Hartman Oct 24, 2015

staging: comedi: adl_pci9118: remove unnecessary check in check_channel_list()



Step 3 of the AI (*do_cmdtest) validates that the cmd->chanlist_len is >= 1. If
it's not the (*do_cmdtest) fails and check_channel_list() is never called. This
This function is also called by the AI (*do_cmd) and the comedi core ensures
that the async command has a valid chanlist. Remove the unnecessary 'n_chan'
check.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 323538b8

drivers/staging/comedi/drivers/adl_pci9118.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -303,11 +303,6 @@ static int check_channel_list(struct comedi_device *dev,
		struct pci9118_private *devpriv = dev->private;
		unsigned int i, differencial = 0, bipolar = 0;

		/* correct channel and range number check itself comedi/range.c */
		if (n_chan < 1) {
		dev_err(dev->class_dev, "range/channel list is empty!\n");
		return 0;
		}
		if ((frontadd + n_chan + backadd) > s->len_chanlist) {
		dev_err(dev->class_dev,
		"range/channel list is too long for actual configuration!\n");