diff --git a/[refs] b/[refs] index ec27a47de591..735ba94f360a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc79022aefaba02ab85edf7df70cd35164888523 +refs/heads/master: b3450faf38294faea229fb9353498ae05b6e2075 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 7d1737a8b65c..98fb86b448be 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -1058,19 +1058,18 @@ pci9111_ao_insn_write(struct comedi_device *dev, return i; } -/* Analog output readback */ - static int pci9111_ao_insn_read(struct comedi_device *dev, struct comedi_subdevice *s, - struct comedi_insn *insn, unsigned int *data) + struct comedi_insn *insn, + unsigned int *data) { struct pci9111_private_data *dev_private = dev->private; int i; for (i = 0; i < insn->n; i++) - data[i] = dev_private->ao_readback & PCI9111_AO_RESOLUTION_MASK; + data[i] = dev_private->ao_readback; - return i; + return insn->n; } static int pci9111_di_insn_bits(struct comedi_device *dev,