Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186841
b: refs/heads/master
c: 882e5b3
h: refs/heads/master
i:
  186839: e763768
v: v3
  • Loading branch information
Andrea Gelmini authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 2d9d070 commit 9c58922
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: ecd89ddcabf8646651f152155bff5f8bed9c6e92
refs/heads/master: 882e5b32b5d68960f46331215fc3c301df508110
6 changes: 2 additions & 4 deletions trunk/drivers/staging/comedi/drivers/das800.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,8 @@ static irqreturn_t das800_interrupt(int irq, void *d)
} else {
fifo_empty = 0; /* cio-das802/16 has no fifo empty status bit */
}
if (fifo_empty) {
if (fifo_empty)
break;
}
/* strip off extraneous bits for 12 bit cards */
if (thisboard->resolution == 12)
dataPoint = (dataPoint >> 4) & 0xfff;
Expand Down Expand Up @@ -457,9 +456,8 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
int board;

printk("comedi%d: das800: io 0x%lx", dev->minor, iobase);
if (irq) {
if (irq)
printk(", irq %u", irq);
}
printk("\n");

/* allocate and initialize dev->private */
Expand Down

0 comments on commit 9c58922

Please sign in to comment.