From e126401d6193eb73a9e95ec6c86435819392e16d Mon Sep 17 00:00:00 2001
From: Benjamin Adolphi <b.adolphi@googlemail.com>
Date: Fri, 15 Jan 2010 18:03:35 +0100
Subject: [PATCH] --- yaml --- r: 186663 b: refs/heads/master c:
 79a22d5c264f5ddfc8573aa7eb234fe62dd1ee32 h: refs/heads/master i:   186661:
 6c09a3bb62471ed1a9d0b7a1a25e04bc7932a34f   186659:
 aaf89ec68b90ed360322aefeedbce13659d1f1a9   186655:
 aecd6cc718ca6fee2eb75b13209350e7f50267ac v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/rti800.c | 41 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 45cd60b92bcd..8acb4aa8f75f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23d53b1768f9396d0e259a9b4e62bfcc03122bab
+refs/heads/master: 79a22d5c264f5ddfc8573aa7eb234fe62dd1ee32
diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c
index 2c9d05bd288c..f2ee5289dbf1 100644
--- a/trunk/drivers/staging/comedi/drivers/rti800.c
+++ b/trunk/drivers/staging/comedi/drivers/rti800.c
@@ -32,22 +32,22 @@ Configuration options:
   [0] - I/O port base address
   [1] - IRQ
   [2] - A/D reference
-          0 = differential
-          1 = pseudodifferential (common)
-          2 = single-ended
+	0 = differential
+	1 = pseudodifferential (common)
+	2 = single-ended
   [3] - A/D range
-          0 = [-10,10]
-          1 = [-5,5]
-          2 = [0,10]
+	0 = [-10,10]
+	1 = [-5,5]
+	2 = [0,10]
   [4] - A/D encoding
-          0 = two's complement
-          1 = straight binary
+	0 = two's complement
+	1 = straight binary
   [5] - DAC 0 range
-          0 = [-10,10]
-          1 = [0,10]
+	0 = [-10,10]
+	1 = [0,10]
   [6] - DAC 0 encoding
-          0 = two's complement
-          1 = straight binary
+	0 = two's complement
+	1 = straight binary
   [7] - DAC 1 range (same as DAC 0)
   [8] - DAC 1 encoding (same as DAC 0)
 */
@@ -240,9 +240,8 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
 		data[i] = inb(dev->iobase + RTI800_ADCLO);
 		data[i] |= (0xf & inb(dev->iobase + RTI800_ADCHI)) << 8;
 
-		if (devpriv->adc_coding == adc_2comp) {
+		if (devpriv->adc_coding == adc_2comp)
 			data[i] ^= 0x800;
-		}
 	}
 
 	return i;
@@ -271,9 +270,9 @@ static int rti800_ao_insn_write(struct comedi_device *dev,
 
 	for (i = 0; i < insn->n; i++) {
 		devpriv->ao_readback[chan] = d = data[i];
-		if (devpriv->dac0_coding == dac_2comp) {
+		if (devpriv->dac0_coding == dac_2comp)
 			d ^= 0x800;
-		}
+
 		outb(d & 0xff,
 		     dev->iobase + (chan ? RTI800_DAC1LO : RTI800_DAC0LO));
 		outb(d >> 8,
@@ -315,15 +314,15 @@ static int rti800_do_insn_bits(struct comedi_device *dev,
    options[0] - I/O port
    options[1] - irq
    options[2] - a/d mux
-   	0=differential, 1=pseudodiff, 2=single
+	0=differential, 1=pseudodiff, 2=single
    options[3] - a/d range
-   	0=bipolar10, 1=bipolar5, 2=unipolar10
+	0=bipolar10, 1=bipolar5, 2=unipolar10
    options[4] - a/d coding
-   	0=2's comp, 1=straight binary
+	0=2's comp, 1=straight binary
    options[5] - dac0 range
-   	0=bipolar10, 1=unipolar10
+	0=bipolar10, 1=unipolar10
    options[6] - dac0 coding
-   	0=2's comp, 1=straight binary
+	0=2's comp, 1=straight binary
    options[7] - dac1 range
    options[8] - dac1 coding
  */