From fcf1333b4e417fa97eda67382e33c9b887413661 Mon Sep 17 00:00:00 2001
From: Frank Mori Hess <frank.hess@nist.gov>
Date: Mon, 22 Feb 2010 15:32:32 -0500
Subject: [PATCH] --- yaml --- r: 186815 b: refs/heads/master c:
 ea12ac4fd241a141cc64683f4293f48bed84fd42 h: refs/heads/master i:   186813:
 8549751982e6f6456821a31793c23d4c1a6338a3   186811:
 9a7303ad5f05fafd22e35de7212efc193bfd2022   186807:
 5b5b15c17bb3968b7dbadc3b7f60e9c8fd4e51a9   186799:
 7ccd54747ffbd7e647778c8bc79297c61a656597   186783:
 bcbac01e5290c3579fc27074fea0240c94beeaa8   186751:
 1f8d03b6fa2bf79f900ecd643b87d1e9ae3c8ddd v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 93fb8514f178..da8338d0ef1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2021937c6d8ec1212b8f4fa01e86f852c9b96368
+refs/heads/master: ea12ac4fd241a141cc64683f4293f48bed84fd42
diff --git a/trunk/drivers/staging/comedi/drivers/ni_mio_common.c b/trunk/drivers/staging/comedi/drivers/ni_mio_common.c
index d6d49c3bbf1c..bd16f913af23 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -3795,7 +3795,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
 #endif
 	int retval = 0;
 	unsigned i;
-	const unsigned timeout = 100;
+	const unsigned timeout = 1000;
 
 	s->async->inttrig = NULL;