diff --git a/[refs] b/[refs] index ee881246323c..0ec475888c0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62eeae93080f1189894b7933d07e5f62461d1cd4 +refs/heads/master: d1a044083c2d09cc146f97dc2a1e7b31dc63fbfb diff --git a/trunk/drivers/staging/comedi/drivers/ni_at_ao.c b/trunk/drivers/staging/comedi/drivers/ni_at_ao.c index 8adb23739846..3778565c1f6b 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_at_ao.c +++ b/trunk/drivers/staging/comedi/drivers/ni_at_ao.c @@ -32,7 +32,8 @@ Configuration options: [0] - I/O port base address [1] - IRQ (unused) [2] - DMA (unused) - [3] - analog output range, set by jumpers on hardware (0 for -10 to 10V bipolar, 1 for 0V to 10V unipolar) + [3] - analog output range, set by jumpers on hardware (0 for -10 to 10V + bipolar, 1 for 0V to 10V unipolar) */ /* @@ -431,9 +432,8 @@ static int atao_calib_insn_read(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data) { int i; - for (i = 0; i < insn->n; i++) { + for (i = 0; i < insn->n; i++) data[i] = 0; /* XXX */ - } return insn->n; }