don't force on COMEDI_CB_BLOCK in comedi_event()

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 98f4e0fe7f38f03f097ddc73f766d236097eef0d..8413912507dd979688da347be905b2409d258e7b 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -925,7 +925,7 @@ static int do_cmd_ioctl(comedi_device *dev,void *arg,void *file)
 
        init_async_buf( async );
 
-       async->cb_mask = COMEDI_CB_EOA|COMEDI_CB_BLOCK|COMEDI_CB_ERROR;
+       async->cb_mask = COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW;
        if(async->cmd.flags & TRIG_WAKE_EOS){
                async->cb_mask |= COMEDI_CB_EOS;
        }
@@ -1844,8 +1844,6 @@ void comedi_event(comedi_device *dev,comedi_subdevice *s, unsigned int mask)
        mask = s->async->events;
        s->async->events = 0;
 
-       mask |= COMEDI_CB_BLOCK;
-
        //DPRINTK("comedi_event %x\n",mask);
 
        if( (s->subdev_flags & SDF_RUNNING) == 0)