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;