Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304527
b: refs/heads/master
c: ac971c9
h: refs/heads/master
i:
  304525: 0543cac
  304523: 9f9471f
  304519: 4965f24
  304511: c4cdcae
v: v3
  • Loading branch information
Ravishankar Karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent 0c08d37 commit 31e7529
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 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: 3c5510ba5091f3d7be338875c84451b07a3dd498
refs/heads/master: ac971c948598b1ca6638ae7a89d3e237b90ad02b
9 changes: 6 additions & 3 deletions trunk/drivers/staging/comedi/drivers/daqboard2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,12 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
DAQBOARD2000_AcqResetScanListFifo |
DAQBOARD2000_AcqResetResultsFifo | DAQBOARD2000_AcqResetConfigPipe;

/* If pacer clock is not set to some high value (> 10 us), we
risk multiple samples to be put into the result FIFO. */
fpga->acqPacerClockDivLow = 1000000; /* 1 second, should be long enough */
/*
* If pacer clock is not set to some high value (> 10 us), we
* risk multiple samples to be put into the result FIFO.
*/
/* 1 second, should be long enough */
fpga->acqPacerClockDivLow = 1000000;
fpga->acqPacerClockDivHigh = 0;

gain = CR_RANGE(insn->chanspec);
Expand Down

0 comments on commit 31e7529

Please sign in to comment.