Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186815
b: refs/heads/master
c: ea12ac4
h: refs/heads/master
i:
  186813: 8549751
  186811: 9a7303a
  186807: 5b5b15c
  186799: 7ccd547
  186783: bcbac01
  186751: 1f8d03b
v: v3
  • Loading branch information
Frank Mori Hess authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 63ce598 commit fcf1333
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2021937c6d8ec1212b8f4fa01e86f852c9b96368
refs/heads/master: ea12ac4fd241a141cc64683f4293f48bed84fd42
2 changes: 1 addition & 1 deletion trunk/drivers/staging/comedi/drivers/ni_mio_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit fcf1333

Please sign in to comment.