summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-10-22 15:36:53 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-29 16:03:13 +0800
commit9a84a7d2e7111aa77a9f35da5e669423d11e0d37 (patch)
treeb03b341b9df2770d41458eaef98bfd21db8f54f8
parent48e08de087ad53b9893cbc44d5ce88e0b8d9f025 (diff)
downloadop-kernel-dev-9a84a7d2e7111aa77a9f35da5e669423d11e0d37.zip
op-kernel-dev-9a84a7d2e7111aa77a9f35da5e669423d11e0d37.tar.gz
staging: comedi: comedi_parport: use comedi_buf_write_samples()
Use comedi_buf_write_samples() to add the sample to the async buffer. The async events COMEDI_CB_BLOCK and COMEDI_CB_EOS will be detected and set by the core. Remove the unnecessary events 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>
-rw-r--r--drivers/staging/comedi/drivers/comedi_parport.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c
index 0bc3844..3bac903 100644
--- a/drivers/staging/comedi/drivers/comedi_parport.c
+++ b/drivers/staging/comedi/drivers/comedi_parport.c
@@ -225,10 +225,9 @@ static irqreturn_t parport_interrupt(int irq, void *d)
if (!(ctrl & PARPORT_CTRL_IRQ_ENA))
return IRQ_NONE;
- comedi_buf_put(s, 0);
- s->async->events |= COMEDI_CB_BLOCK | COMEDI_CB_EOS;
-
+ comedi_buf_write_samples(s, &s->state, 1);
comedi_handle_events(dev, s);
+
return IRQ_HANDLED;
}
OpenPOWER on IntegriCloud