Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186831
b: refs/heads/master
c: 882e123
h: refs/heads/master
i:
  186829: c7151db
  186827: 1a0967a
  186823: 53ea081
  186815: fcf1333
v: v3
  • Loading branch information
Andrea Gelmini authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 054a42f commit d41088a
Show file tree
Hide file tree
Showing 2 changed files with 6 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: a9ecb5bb5847b084d6d8bf5c60549fd5598c053a
refs/heads/master: 882e1233a1abb650149496b33eaeb1d09bbc0b7a
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour
#include "hwdrv_apci1032.h"
#include <linux/delay.h>
/* Global variables */
unsigned int ui_InterruptStatus = 0;
unsigned int ui_InterruptStatus;

/*
+----------------------------------------------------------------------------+
Expand Down Expand Up @@ -108,9 +108,9 @@ int i_APCI1032_ConfigDigitalInput(struct comedi_device *dev, struct comedi_subde
ui_TmpValue =
inl(devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
} /* if (data[1] == ADDIDATA_OR) */
else {
else
outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ);
} /* else if(data[1] == ADDIDATA_OR) */
/* else if(data[1] == ADDIDATA_OR) */
} /* if( data[0] == ADDIDATA_ENABLE) */
else {
ul_Command1 = ul_Command1 & 0xFFFF0000;
Expand Down Expand Up @@ -221,9 +221,9 @@ int i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub
} /* switch(ui_NoOfChannels) */
} /* if(data[1]==0) */
else {
if (data[1] == 1) {
if (data[1] == 1)
*data = ui_InterruptStatus;
} /* if(data[1]==1) */
/* if(data[1]==1) */
} /* else if(data[1]==0) */
return insn->n;
}
Expand Down

0 comments on commit d41088a

Please sign in to comment.