Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337352
b: refs/heads/master
c: 543a09e
h: refs/heads/master
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Oct 29, 2012
1 parent f37112f commit ab786d9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: b58d6021d4dbc215dc975510bb2509e66e6061be
refs/heads/master: 543a09e9cf1485a8b55f6459b28f3fbab7bb55c3
6 changes: 4 additions & 2 deletions trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,8 @@ static int daqp_ai_insn_read(struct comedi_device *dev,
*/

while (--counter
&& (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ;
&& (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS))
;
if (!counter) {
printk("daqp: couldn't clear interrupts in status register\n");
return -1;
Expand Down Expand Up @@ -732,7 +733,8 @@ static int daqp_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
*/
counter = 100;
while (--counter
&& (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ;
&& (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS))
;
if (!counter) {
dev_err(dev->class_dev,
"couldn't clear interrupts in status register\n");
Expand Down

0 comments on commit ab786d9

Please sign in to comment.