Commit f2929618 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: usbdux: fix usbdux_counter_write()

Comedi (*insn_write) operations are supposed to write insn->n values.
Fix this function to work like the core expects.

Rename the local variable used for the private data pointer to the
comedi "norm".

Remove the unnecessary sanity check of the private data pointer. This
function can only be called is the private data was allocated during
the attach.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 48967d4f
...@@ -1369,27 +1369,30 @@ static int usbdux_counter_read(struct comedi_device *dev, ...@@ -1369,27 +1369,30 @@ static int usbdux_counter_read(struct comedi_device *dev,
static int usbdux_counter_write(struct comedi_device *dev, static int usbdux_counter_write(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
struct usbdux_private *this_usbduxsub = dev->private; struct usbdux_private *devpriv = dev->private;
int err; unsigned int chan = CR_CHAN(insn->chanspec);
int16_t *p = (int16_t *)&devpriv->dux_commands[2];
int ret = 0;
int i;
if (!this_usbduxsub) down(&devpriv->sem);
return -EFAULT;
down(&this_usbduxsub->sem); devpriv->dux_commands[1] = chan;
this_usbduxsub->dux_commands[1] = insn->chanspec;
*((int16_t *) (this_usbduxsub->dux_commands + 2)) = cpu_to_le16(*data);
err = send_dux_commands(dev, WRITECOUNTERCOMMAND); for (i = 0; i < insn->n; i++) {
if (err < 0) { *p = cpu_to_le16(data[i]);
up(&this_usbduxsub->sem);
return err; ret = send_dux_commands(dev, WRITECOUNTERCOMMAND);
if (ret < 0)
break;
} }
up(&this_usbduxsub->sem); up(&devpriv->sem);
return 1; return ret ? ret : insn->n;
} }
static int usbdux_counter_config(struct comedi_device *dev, static int usbdux_counter_config(struct comedi_device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment