staging: comedi: adl_pci9118: remove unnecessary check in check_channel_list()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 19 Oct 2015 20:12:57 +0000 (13:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Oct 2015 02:17:13 +0000 (19:17 -0700)
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>
drivers/staging/comedi/drivers/adl_pci9118.c

index a7c974423a3e6437ce086d62edd36631beb0a760..dcfe5cc08220c447a7da468b0f26f284eaf08506 100644 (file)
@@ -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");