From 4aef51d4ae2409b6d3dac340003bbf48582c0b5b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 10 Sep 2012 18:54:08 -0700 Subject: [PATCH] --- yaml --- r: 325119 b: refs/heads/master c: 2084fd19f8dbe5c47f36364e725c58eca910dcc4 h: refs/heads/master i: 325117: 6285b63326f77c06f3c0f4bf8bab45ced04dc37f 325115: a97d4c358fd89f631f5d3c1efb495286a3d28da3 325111: d567afb4d8390b173ffe2d76bae3be0885decd04 325103: e39ce7f89f2680a1ab45d7faf9e2008acd7ca8af 325087: b4159ea106fe3b6820c3ce73da251dc7a4bda433 325055: 11812dddc866b5cf0cc4b3339813126e2ad0d657 324991: 2df8fb1dfdb205fdfcc3346119b46b59cae966d2 324863: 14aac42b0a1a75e423a9b57c264f0ce0d3827545 324607: 3e275cd4f18a97bb227afd80f3923e91e3e4b40f v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/adl_pci9111.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) 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,