Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325117
b: refs/heads/master
c: b3450fa
h: refs/heads/master
i:
  325115: a97d4c3
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 8198bc3 commit 6285b63
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dc79022aefaba02ab85edf7df70cd35164888523
refs/heads/master: b3450faf38294faea229fb9353498ae05b6e2075
9 changes: 4 additions & 5 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6285b63

Please sign in to comment.