Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325114
b: refs/heads/master
c: bfa6d3b
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 397f752 commit 6fa6a01
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 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: 101e490a2a2a81f41c9e82acba80a537824aa499
refs/heads/master: bfa6d3b80fe578d6f930107f75b600920d7e74e0
14 changes: 3 additions & 11 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -1078,20 +1078,12 @@ static int pci9111_ao_insn_read(struct comedi_device *dev,
return i;
}

/* ------------------------------------------------------------------ */
/* DIGITAL INPUT OUTPUT SECTION */
/* ------------------------------------------------------------------ */

/* Digital inputs */

static int pci9111_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
struct comedi_insn *insn,
unsigned int *data)
{
unsigned int bits;

bits = inw(dev->iobase + PCI9111_DIO_REG);
data[1] = bits;
data[1] = inw(dev->iobase + PCI9111_DIO_REG);

return insn->n;
}
Expand Down

0 comments on commit 6fa6a01

Please sign in to comment.