rolling back last change
authorFrank Mori Hess <fmhess@speakeasy.net>
Fri, 11 May 2001 14:58:41 +0000 (14:58 +0000)
committerFrank Mori Hess <fmhess@speakeasy.net>
Fri, 11 May 2001 14:58:41 +0000 (14:58 +0000)
comedi/comedi_fops.c

index fc8643bf683969a1a00035d48945c65365f04fdb..d691f0866a8e12769f873b084f8aa09372a989c1 100644 (file)
@@ -1657,15 +1657,15 @@ printk("m is %d\n",m);
                if(m<n)n=m;
 
                if(n==0){
-                       if(file->f_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;