From ad75d5a1f3a2baea5880a5d16e88ac766871a753 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Mon, 4 Aug 2003 18:48:40 +0000 Subject: [PATCH] update to 2.6 interrupt handler prototype --- comedi/drivers/comedi_parport.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/comedi/drivers/comedi_parport.c b/comedi/drivers/comedi_parport.c index b8defbc9..5e61c55f 100644 --- a/comedi/drivers/comedi_parport.c +++ b/comedi/drivers/comedi_parport.c @@ -264,20 +264,21 @@ static int parport_intr_cancel(comedi_device *dev,comedi_subdevice *s) return 0; } -static void parport_interrupt(int irq,void *d,struct pt_regs *regs) +static irqreturn_t parport_interrupt(int irq,void *d,struct pt_regs *regs) { comedi_device *dev=d; comedi_subdevice *s=dev->subdevices+3; if(!devpriv->enable_irq){ printk("comedi_parport: bogus irq, ignored\n"); - return; + return IRQ_NONE; } comedi_buf_put( s->async, 0 ); s->async->events |= COMEDI_CB_EOS; - + comedi_event(dev,s,s->async->events); + return IRQ_HANDLED; } static int parport_attach(comedi_device *dev,comedi_devconfig *it) -- 2.26.2