]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: addi_apci_2032: use comedi_buf_write_samples()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 22 Oct 2014 22:37:10 +0000 (15:37 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2014 08:03:15 +0000 (16:03 +0800)
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi_apci_2032.c

index ad75294594292151a0145da9c9bfc7f8d882d972..7a5659fafbb37d021e6aadd9b973a43f48fc09a5 100644 (file)
@@ -211,8 +211,7 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
                                bits |= (1 << i);
                }
 
-               if (comedi_buf_put(s, bits)) {
-                       s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
+               if (comedi_buf_write_samples(s, &bits, 1)) {
                        if (cmd->stop_src == TRIG_COUNT &&
                            subpriv->stop_count > 0) {
                                subpriv->stop_count--;
@@ -221,8 +220,6 @@ static irqreturn_t apci2032_interrupt(int irq, void *d)
                                        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,
                        return -ENOMEM;
                spin_lock_init(&subpriv->spinlock);
                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->do_cmdtest   = apci2032_int_cmdtest;
                s->do_cmd       = apci2032_int_cmd;