Patch "staging: comedi: usbduxsigma: don't clobber ao_timer in command test" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
staging: comedi: usbduxsigma: don't clobber ao_timer in command test
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-comedi-usbduxsigma-don-t-clobber-ao_timer-in-command-test.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c04a1f17803e0d3eeada586ca34a6b436959bc20Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Thu, 23 Jul 2015 16:46:58 +0100
Subject: staging: comedi: usbduxsigma: don't clobber ao_timer in command test
From: Ian Abbott <[email protected]>
commit c04a1f17803e0d3eeada586ca34a6b436959bc20 upstream.
devpriv->ao_timer is used while an asynchronous command is running on the AO subdevice. It also gets modified by the subdevice's cmdtest handler for checking new asynchronous commands, usbduxsigma_ao_cmdtest(), which is not correct as it's allowed to check new commands while an old command is still running. Fix it by moving the code which sets up devpriv->ao_timer into the subdevice's cmd handler, usbduxsigma_ao_cmd().
Note that the removed code in usbduxsigma_ao_cmdtest() checked that devpriv->ao_timer did not end up less that 1, but that could not happen due because cmd->scan_begin_arg or cmd->convert_arg had already been range-checked.
Also note that we tested the high_speed variable in the old code, but that is currently always 0 and means that we always use "scan" timing (cmd->scan_begin_src == TRIG_TIMER and cmd->convert_src == TRIG_NOW) and never "convert" (individual sample) timing (cmd->scan_begin_src == TRIG_FOLLOW and cmd->convert_src == TRIG_TIMER). The moved code tests cmd->convert_src instead to decide whether "scan" or "convert" timing is being used, although currently only "scan" timing is supported.
--- drivers/staging/comedi/drivers/usbduxsigma.c | 41 +++++++++++---------------- 1 file changed, 17 insertions(+), 24 deletions(-)
drivers/staging/comedi/drivers/usbduxsigma.c +17 -24
@@ -951,10 +951,24 @@ static int usbduxsigma_ao_cmdtest(structif (err)return 3 ; -/* Step 4: fix up any arguments */ +return 0 ; +} + +static int usbduxsigma_ao_cmd (struct comedi_device *dev, +struct comedi_subdevice *s) +{ +struct usbduxsigma_private *devpriv = dev->private; +struct comedi_cmd *cmd = &s->async->cmd; +int ret; +int i; + +down (&devpriv->sem); + +/* set current channel of the running acquisition to zero */ + s->async->cur_chan =0 ;/* we count in timer steps */ -if (high_speed) { +if (cmd->convert_src ==TRIG_TIMER ) {/* timing of the conversion itself: every 125 us */ devpriv->ao_timer = cmd->convert_arg /125000 ; }else {
@@ -964,12 +978,9 @@ static int usbduxsigma_ao_cmdtest(struct*/ devpriv->ao_timer = cmd->scan_begin_arg /1000000 ; } -if (devpriv->ao_timer <1 ) - err |= -EINVAL ; -if (cmd->stop_src ==TRIG_COUNT ) {/* not continuous, use counter */ -if (high_speed) { +if (cmd->convert_src ==TRIG_TIMER ) {/* high speed also scans everything at once */ devpriv->ao_sample_count = cmd->stop_arg * cmd->scan_end_arg;
@@ -988,24 +999,6 @@ static int usbduxsigma_ao_cmdtest(struct devpriv->ao_sample_count =0 ; } -if (err) -return 4 ; - -return 0 ; -} - -static int usbduxsigma_ao_cmd (struct comedi_device *dev, -struct comedi_subdevice *s) -{ -struct usbduxsigma_private *devpriv = dev->private; -struct comedi_cmd *cmd = &s->async->cmd; -int ret; -int i; - -down (&devpriv->sem); - -/* set current channel of the running acquisition to zero */ - s->async->cur_chan =0 ;for (i =0 ; i < cmd->chanlist_len; ++i) devpriv->ao_chanlist[i] =CR_CHAN (cmd->chanlist[i]);
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/staging-comedi-usbduxsigma-don-t-clobber-ao_timer-in-command-test.patch queue-3.14/staging-comedi-usbduxsigma-don-t-clobber-ai_timer-in-command-test.patch