---

yaml --- r: 337615 b: refs/heads/master c: dfb8a4a h: refs/heads/master i: 337613: 88bb338 337611: 8a4ba9c 337607: ed9feac 337599: 3c43b8e v: v3
git-mirror · Nov 2, 2012 · 5d3b7a6 · 5d3b7a6
1 parent 6d66e06
commit 5d3b7a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97e998de5dd8c06900badb6822bf81497448c92a
+refs/heads/master: dfb8a4abe90db760b87308f47f8a74eb17288ba1
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -777,10 +777,8 @@ static int i_APCI3120_CommandTestAnalogInput(struct comedi_device *dev,
 	}
 
 	if (cmd->scan_begin_src == TRIG_TIMER) {	/*  Test Delay timing */
-		if (cmd->scan_begin_arg <
-				this_board->ui_MinDelaytimeNs) {
-			cmd->scan_begin_arg =
-				this_board->ui_MinDelaytimeNs;
+		if (cmd->scan_begin_arg < 100000) {
+			cmd->scan_begin_arg = 100000;
 			err++;
 		}
 	}

diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -26,7 +26,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
 		.b_AvailableConvertUnit	= 1,
-		.ui_MinDelaytimeNs	= 100000,
 		.interrupt		= v_APCI3120_Interrupt,
 		.ao_write		= i_APCI3120_InsnWriteAnalogOutput,
 	}, {
@@ -41,7 +40,6 @@ static const struct addi_board apci3120_boardtypes[] = {
 		.i_NbrDoChannel		= 4,
 		.i_DoMaxdata		= 0x0f,
 		.b_AvailableConvertUnit	= 1,
-		.ui_MinDelaytimeNs	= 100000,
 		.interrupt		= v_APCI3120_Interrupt,
 	},
 };