Index: comedi/drivers/amplc_pci230.c
===================================================================
RCS file: /cvs/comedi/comedi/comedi/drivers/amplc_pci230.c,v
retrieving revision 1.32
diff -u -r1.32 amplc_pci230.c
--- comedi/drivers/amplc_pci230.c	7 Oct 2005 05:08:13 -0000	1.32
+++ comedi/drivers/amplc_pci230.c	20 Jan 2006 13:33:41 -0000
@@ -388,6 +388,9 @@
  */
 	dev->board_name = thisboard->name;
 
+	/* Disable board's interrupts. */
+	outb(0, devpriv->pci_iobase + PCI230_INT_SCE);
+
 	/* Register the interrupt handler. */
 	irq_hdl = comedi_request_irq(devpriv->pci_dev->irq, pci230_interrupt, SA_SHIRQ, "amplc_pci230", dev);
 	if(irq_hdl<0) {
@@ -1398,7 +1401,6 @@
 	int status_int;
 	comedi_device *dev = (comedi_device*) d;
 	comedi_subdevice *s;
-	int retval = 1;
 
 	/* Read interrupt status/enable register. */
 	status_int = inb(devpriv->pci_iobase + PCI230_INT_SCE);
@@ -1435,7 +1437,7 @@
 		s->async->events = 0;
 	}
 
-	return IRQ_RETVAL(retval);
+	return IRQ_HANDLED;
 }
 
 static void pci230_handle_ao(comedi_device *dev, comedi_subdevice *s) {
@@ -1505,7 +1507,7 @@
 		s->async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
 		pci230_ai_cancel(dev, s);	
 	}
-	if(devpriv->ai_count == 0 && devpriv->ai_stop == 0) {
+	else if(devpriv->ai_count == 0 && devpriv->ai_stop == 0) {
 		/* Acquisition complete. */
 		s->async->events |= COMEDI_CB_EOA;
 		pci230_ai_cancel(dev, s);			/* disable hardware conversions */