From 70f804f4e15209f255c38b077ac419904def0eaf Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Mon, 4 Jun 2001 02:16:30 +0000 Subject: [PATCH] fixed conversion timing check for TRIG_NOW case --- comedi/drivers/comedi_rt_timer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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) { -- 2.26.2