From: Frank Mori Hess Date: Fri, 11 May 2001 14:58:41 +0000 (+0000) Subject: rolling back last change X-Git-Tag: r0_7_59~49 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26a2fefc7c0de5f8dae352e584c0b5d5cb2e4bf8;p=comedi.git rolling back last change --- diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c index fc8643bf..d691f086 100644 --- a/comedi/comedi_fops.c +++ b/comedi/comedi_fops.c @@ -1657,15 +1657,15 @@ printk("m is %d\n",m); if(mf_flags&O_NONBLOCK){ - retval=-EAGAIN; - break; - } if(!(s->subdev_flags&SDF_RUNNING)){ do_become_nonbusy(dev,s); retval=-EINVAL; break; } + if(file->f_flags&O_NONBLOCK){ + retval=-EAGAIN; + break; + } if(signal_pending(current)){ retval=-ERESTARTSYS; break;