From: H Hartley Sweeten Date: Wed, 22 Oct 2014 22:36:53 +0000 (-0700) Subject: staging: comedi: comedi_parport: use comedi_buf_write_samples() X-Git-Tag: firefly_0821_release~176^2~2665^2~749 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a84a7d2e7111aa77a9f35da5e669423d11e0d37;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/comedi_parport.c b/drivers/staging/comedi/drivers/comedi_parport.c index 0bc3844073ee..3bac903c8627 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; }