From: H Hartley Sweeten Date: Tue, 9 Sep 2014 23:15:43 +0000 (-0700) Subject: staging: comedi: amplc_pci230: remove analog input "empty acquisition" async command X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=df9f5bad2187203d6c87cb406bab5f7675618498;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: comedi: amplc_pci230: remove analog input "empty acquisition" async command This driver currently allows a cmd->stop_src == TRIG_COUNT with a cmd->stop_arg of 0. This causes the (*do_cmd) to immediately generate a COMEDI_CB_EOA event without acquiring any data. This "empty acquisition" async command is not really useful. Validate that the cmd->stop_arg is >= 1 in the (*do_cmdtest) and remove the "empty acquisition" code. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index a4d94f2605a3..a0bf4600c992 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -1679,7 +1679,9 @@ static int pci230_ai_cmdtest(struct comedi_device *dev, err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len); - if (cmd->stop_src == TRIG_NONE) + if (cmd->stop_src == TRIG_COUNT) + err |= cfc_check_trigger_arg_min(&cmd->stop_arg, 1); + else /* TRIG_NONE */ err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0); if (cmd->scan_begin_src == TRIG_EXT) { @@ -1908,13 +1910,6 @@ static void pci230_ai_start(struct comedi_device *dev, struct comedi_cmd *cmd = &async->cmd; devpriv->ai_cmd_started = true; - if (cmd->stop_src == TRIG_COUNT && devpriv->ai_scan_count == 0) { - /* An empty acquisition! */ - async->events |= COMEDI_CB_EOA; - pci230_ai_stop(dev, s); - comedi_event(dev, s); - return; - } /* Enable ADC FIFO trigger level interrupt. */ spin_lock_irqsave(&devpriv->isr_spinlock, irqflags);