aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorFrank Mori Hess <frank.hess@nist.gov>2010-02-22 15:32:32 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:43:03 -0800
commitea12ac4fd241a141cc64683f4293f48bed84fd42 (patch)
tree241e7b1f1bbf327c24a500b6c9306e51b9d74ec5 /drivers/staging/comedi
parent2021937c6d8ec1212b8f4fa01e86f852c9b96368 (diff)
Staging: comedi: Increased timeout for digital output dma loading
Increased timeout for digital output dma loading, due to report of it being too short for some hardware. Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index d6d49c3bbf1..bd16f913af2 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/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;