From: H Hartley Sweeten Date: Mon, 5 Oct 2015 21:23:10 +0000 (-0700) Subject: staging: comedi: quatech_daqp_cs: ai async command requires a pacer X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0d77ef8b43d6a9124f37b2f098b6d65573db0de3;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: quatech_daqp_cs: ai async command requires a pacer The ai (*do_cmd) assumes that either the convert_src is TRIG_TIMER or the scan_begin_src is TRIG_TIMER and always programs the pacer clock with the appropriate trigger argument. Add a Step 2b check to the (*do_cmdtest) to ensure that at least one of the triggers is TRIG_TIMER. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 0ea02f0e1aa2..b56d126869e3 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -394,6 +394,10 @@ static int daqp_ai_cmdtest(struct comedi_device *dev, /* Step 2b : and mutually compatible */ + /* the async command requires a pacer */ + if (cmd->scan_begin_src != TRIG_TIMER && cmd->convert_src != TRIG_TIMER) + err |= -EINVAL; + if (err) return 2;