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

staging: comedi: addi_apci_2032: use comedi_buf_write_samples()

The dev->read_subdev used in this driver for async commands returns the
full scan with each sample so it should have the SDF_PACKED subdev_flag
set.

Add the missing subdev_flags and use comedi_buf_write_samples() to add
the sample to the async buffer.

The core sets the async events appropriately. Remove the unnecessary
event handling in the driver.
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 435efc8a
...@@ -211,8 +211,7 @@ static irqreturn_t apci2032_interrupt(int irq, void *d) ...@@ -211,8 +211,7 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
bits |= (1 << i); bits |= (1 << i);
} }
if (comedi_buf_put(s, bits)) { if (comedi_buf_write_samples(s, &bits, 1)) {
s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
if (cmd->stop_src == TRIG_COUNT && if (cmd->stop_src == TRIG_COUNT &&
subpriv->stop_count > 0) { subpriv->stop_count > 0) {
subpriv->stop_count--; subpriv->stop_count--;
...@@ -221,8 +220,6 @@ static irqreturn_t apci2032_interrupt(int irq, void *d) ...@@ -221,8 +220,6 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
} }
} }
} else {
s->async->events |= COMEDI_CB_OVERFLOW;
} }
} }
...@@ -299,7 +296,7 @@ static int apci2032_auto_attach(struct comedi_device *dev, ...@@ -299,7 +296,7 @@ static int apci2032_auto_attach(struct comedi_device *dev,
return -ENOMEM; return -ENOMEM;
spin_lock_init(&subpriv->spinlock); spin_lock_init(&subpriv->spinlock);
s->private = subpriv; s->private = subpriv;
s->subdev_flags = SDF_READABLE | SDF_CMD_READ; s->subdev_flags = SDF_READABLE | SDF_CMD_READ | SDF_PACKED;
s->len_chanlist = 2; s->len_chanlist = 2;
s->do_cmdtest = apci2032_int_cmdtest; s->do_cmdtest = apci2032_int_cmdtest;
s->do_cmd = apci2032_int_cmd; s->do_cmd = apci2032_int_cmd;
......
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