From 7c999314efef94be997b762bc22f0be55e139df8 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 19 Oct 2015 13:12:57 -0700 Subject: [PATCH] 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adl_pci9118.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index a7c974423a3e..dcfe5cc08220 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -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"); -- 2.20.1