Fixed spurious warnings about AO interrupts not being acked, due to

my recent changes.

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index fcae98e1e009ed6267f1ea6eb9ab74b40162a8b4..2f5a3fa615d518a0ab9b3590d7a029a5c8bcb2e6 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -1406,8 +1406,9 @@ static ssize_t comedi_write(struct file *file,const char *buf,size_t nbytes,loff
                }
                comedi_buf_write_alloc(async, async->prealloc_bufsz);
                if(m > comedi_buf_write_n_allocated(async))
+               {
                        m = comedi_buf_write_n_allocated(async);
-
+               }
                if(m < n) n = m;
 
                if(n==0){

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 6fd0ef486efc74c8e51904b1e564d5e163e071b7..4fd3608fb27b680694073ec269e1a80982e95d31 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -909,16 +909,6 @@ static void handle_b_interrupt(comedi_device *dev, unsigned short b_status,
        }
 #endif
 
-       b_status=devpriv->stc_readw(dev, AO_Status_1_Register);
-       if(b_status&Interrupt_B_St){
-               if(b_status&AO_FIFO_Request_St){
-                       rt_printk("ni_mio_common: AO buffer underrun\n");
-               }
-               rt_printk("Ack! didn't clear AO interrupt. b_status=0x%04x\n",b_status);
-               ni_set_bits(dev,Interrupt_B_Enable_Register,~0,0);
-               s->async->events |= COMEDI_CB_OVERFLOW;
-       }
-
        ni_event(dev,s,s->async->events);
 }