projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
comedi
/
drivers
/
ni_daq_700.c
diff --git
a/drivers/staging/comedi/drivers/ni_daq_700.c
b/drivers/staging/comedi/drivers/ni_daq_700.c
index d067ef70e194d3e736e28eb975d95502b4565392..5e80d428e544d223cbaae0be62051685782b5765 100644
(file)
--- a/
drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/
drivers/staging/comedi/drivers/ni_daq_700.c
@@
-127,6
+127,8
@@
static int daq700_ai_rinsn(struct comedi_device *dev,
/* write channel to multiplexer */
/* set mask scan bit high to disable scanning */
outb(chan | 0x80, dev->iobase + CMD_R1);
+ /* mux needs 2us to really settle [Fred Brooks]. */
+ udelay(2);
/* convert n samples */
for (n = 0; n < insn->n; n++) {