diff --git a/[refs] b/[refs] index 7f2e0b6c8df7..75a9ebc1e320 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b7044dcfc1c1df1b8858ead6456158f0d925725 +refs/heads/master: 2084fd19f8dbe5c47f36364e725c58eca910dcc4 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index d5226a8c573a..10f1b87affec 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -1035,22 +1035,22 @@ static int pci9111_ai_insn_read(struct comedi_device *dev, return i; } -/* Analog instant output */ - -static int -pci9111_ao_insn_write(struct comedi_device *dev, - struct comedi_subdevice *s, struct comedi_insn *insn, - unsigned int *data) +static int pci9111_ao_insn_write(struct comedi_device *dev, + struct comedi_subdevice *s, + struct comedi_insn *insn, + unsigned int *data) { struct pci9111_private_data *dev_private = dev->private; + unsigned int val = 0; int i; for (i = 0; i < insn->n; i++) { - outw(data[i], dev->iobase + PCI9111_AO_REG); - dev_private->ao_readback = data[i]; + val = data[i]; + outw(val, dev->iobase + PCI9111_AO_REG); } + dev_private->ao_readback = val; - return i; + return insn->n; } static int pci9111_ao_insn_read(struct comedi_device *dev,