From 5d3b7a6d697aa89e4d8b0a40e60ce6c4703f5d84 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 1 Nov 2012 17:29:46 -0700
Subject: [PATCH] --- yaml --- r: 337615 b: refs/heads/master c:
 dfb8a4abe90db760b87308f47f8a74eb17288ba1 h: refs/heads/master i:   337613:
 88bb338f25feb649a0872d5fa383b5cdee674363   337611:
 8a4ba9ce728f23bb4009ca6bab333f16f77a7350   337607:
 ed9feac3e2128aa8c5d7bea593d05d4c6cb8c23c   337599:
 3c43b8e66c7d378c08f5144a7f15cd821b7d9b0a v: v3

---
 [refs]                                                      | 2 +-
 .../staging/comedi/drivers/addi-data/hwdrv_apci3120.c       | 6 ++----
 trunk/drivers/staging/comedi/drivers/addi_apci_3120.c       | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 243821456036..7acf0211ccf6 100644
--- 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
index ac2e4110f2f8..094691769bdc 100644
--- 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
index 8e32fbbf3547..9ec6bb19954f 100644
--- 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,
 	},
 };