p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: comedi: dt282x: fix the ao cmd->start_arg use for TRIG_INT 

This driver only supports a cmd->start_src of TRIG_INT for ao commands. The
cmd->start_arg is trivially validated to be 0. For TRIG_INT source, the
cmd->start_arg is actually the valid trig_num that is passed to the async
(*inttrig) callback.

Refactor the (*inttrig) function so that the cmd->start_arg is used to check
the trig_num instead of the open coded value.

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>
This commit is contained in:
H Hartley Sweeten 2014-04-17 10:07:59 -07:00 committed by Greg Kroah-Hartman
parent 020cb120c1
commit bdbca9b562
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/dt282x.c
View File

@ -878,12 +878,14 @@ static int dt282x_ao_cmdtest(struct comedi_device *dev,
} }
static int dt282x_ao_inttrig(struct comedi_device *dev, static int dt282x_ao_inttrig(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned int x) struct comedi_subdevice *s,
unsigned int trig_num)
{ {
struct dt282x_private *devpriv = dev->private; struct dt282x_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
int size; int size;
if (x != 0) if (trig_num != cmd->start_src)
return -EINVAL; return -EINVAL;
size = cfc_read_array_from_buffer(s, devpriv->dma[0].buf, size = cfc_read_array_from_buffer(s, devpriv->dma[0].buf,