From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Mon, 4 Jun 2001 02:16:30 +0000 (+0000)
Subject: fixed conversion timing check for TRIG_NOW case
X-Git-Tag: r0_7_60~189
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70f804f4e15209f255c38b077ac419904def0eaf;p=comedi.git

fixed conversion timing check for TRIG_NOW case
---

diff --git a/comedi/drivers/comedi_rt_timer.c b/comedi/drivers/comedi_rt_timer.c
index e7553b38..50f43938 100644
--- a/comedi/drivers/comedi_rt_timer.c
+++ b/comedi/drivers/comedi_rt_timer.c
@@ -236,11 +236,11 @@ static void input_scan_task_func(int d)
 				// conversion timing
 				if(cmd->convert_src == TRIG_TIMER && i){
 					rt_task_wait_period();
-				}
-				ret = check_conversion_timing(dev, scan_start, i);
-				if(ret < 0){
-					comedi_error_done(dev,s);
-					goto cleanup;
+					ret = check_conversion_timing(dev, scan_start, i);
+					if(ret < 0){
+						comedi_error_done(dev,s);
+						goto cleanup;
+					}
 				}
 				ret = comedi_data_read(devpriv->device,devpriv->subd,
 					CR_CHAN(cmd->chanlist[i]),
@@ -308,11 +308,11 @@ static void output_scan_task_func(int d)
 				// conversion timing
 				if(cmd->convert_src == TRIG_TIMER && i){
 					rt_task_wait_period();
-				}
-				ret = check_conversion_timing(dev, scan_start, i);
-				if(ret < 0){
-					comedi_error_done(dev,s);
-					goto cleanup;
+					ret = check_conversion_timing(dev, scan_start, i);
+					if(ret < 0){
+						comedi_error_done(dev,s);
+						goto cleanup;
+					}
 				}
 				data = buf_remove(dev, s);
 				if(data < 0) {