Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364197
b: refs/heads/master
c: e245b6d
h: refs/heads/master
i:
  364195: 263872c
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 23, 2013
1 parent df67771 commit 43337e0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 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: 26234771c1a53b0a3bf69c161d79cd37c77ebd1a
refs/heads/master: e245b6d12691c1e178a6a075ac3cd1b7cd0d2e0e
7 changes: 1 addition & 6 deletions trunk/drivers/staging/comedi/drivers/das800.c
Original file line number Diff line number Diff line change
Expand Up @@ -632,12 +632,7 @@ static int das800_di_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
unsigned int bits;

bits = inb(dev->iobase + DAS800_STATUS) >> 4;
bits &= 0x7;
data[1] = bits;
data[0] = 0;
data[1] = (inb(dev->iobase + DAS800_STATUS) >> 4) & 0x7;

return insn->n;
}
Expand Down

0 comments on commit 43337e0

Please sign in to comment.