From: H Hartley Sweeten Date: Thu, 18 Sep 2014 18:35:35 +0000 (-0700) Subject: staging: comedi: me4000: use comedi_handle_events() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3fa1eb64d6d670676946ccd42d48452aecb96c2d;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: me4000: use comedi_handle_events() Use comedi_handle_events() to automatically (*cancel) the async command for an end-of-acquisition or if an error/overflow occurs. Also, comedi_handle_events() does nothing if no events are set so the check can be removed. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index 6561b00bea59..6516ac0c7b46 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -1178,8 +1178,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id) outl(tmp, dev->iobase + ME4000_AI_CTRL_REG); } - if (s->async->events) - comedi_event(dev, s); + comedi_handle_events(dev, s); return IRQ_HANDLED; }