From d41088afa3a478eebe2ddfcdce5dc704b1ea3bfc Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 26 Feb 2010 10:14:58 +0100 Subject: [PATCH] --- yaml --- r: 186831 b: refs/heads/master c: 882e1233a1abb650149496b33eaeb1d09bbc0b7a h: refs/heads/master i: 186829: c7151db6a6321fca1bb4258ea2d0cfd627d2c559 186827: 1a0967a710624057c948ac029e3e75f79d1f5065 186823: 53ea081434e2dc23252a853b532ea9271cff94a9 186815: fcf1333b4e417fa97eda67382e33c9b887413661 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi-data/hwdrv_apci1032.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 92e8bf03c05e..48ed3b70257f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9ecb5bb5847b084d6d8bf5c60549fd5598c053a +refs/heads/master: 882e1233a1abb650149496b33eaeb1d09bbc0b7a diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index 27c68aac32d1..fe06789699f3 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c @@ -54,7 +54,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour #include "hwdrv_apci1032.h" #include /* Global variables */ -unsigned int ui_InterruptStatus = 0; +unsigned int ui_InterruptStatus; /* +----------------------------------------------------------------------------+ @@ -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; @@ -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; }