From 951fb1916e5247710b75aea83cb9719582c56145 Mon Sep 17 00:00:00 2001
From: Benjamin Adolphi <b.adolphi@googlemail.com>
Date: Sat, 6 Feb 2010 20:06:50 +0100
Subject: [PATCH] --- yaml --- r: 186851 b: refs/heads/master c:
 dedf3ad1534ff5e30a2eba88afe64bbe7beecfb6 h: refs/heads/master i:   186849:
 ce77aa51012e70c6aaeb995364bb47742fe84943   186847:
 69db7a66a033d4d6eab1ccf3263fdd1fbb38a282 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/staging/comedi/drivers/pcmad.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 411d2821fb2b..1312709aaa9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52d83bde6f10480268c454b3373bfcec8c2e3c3e
+refs/heads/master: dedf3ad1534ff5e30a2eba88afe64bbe7beecfb6
diff --git a/trunk/drivers/staging/comedi/drivers/pcmad.c b/trunk/drivers/staging/comedi/drivers/pcmad.c
index acac67090810..f7991a9e0a78 100644
--- a/trunk/drivers/staging/comedi/drivers/pcmad.c
+++ b/trunk/drivers/staging/comedi/drivers/pcmad.c
@@ -34,11 +34,11 @@ Configuration options:
   [0] - I/O port base
   [1] - unused
   [2] - Analog input reference
-          0 = single ended
-          1 = differential
+	0 = single ended
+	1 = differential
   [3] - Analog input encoding (must match jumpers)
-          0 = straight binary
-          1 = two's complement
+	0 = straight binary
+	1 = two's complement
 */
 
 #include <linux/interrupt.h>
@@ -113,9 +113,8 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
 		data[n] = inb(dev->iobase + PCMAD_LSB);
 		data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8);
 
-		if (devpriv->twos_comp) {
+		if (devpriv->twos_comp)
 			data[n] ^= (1 << (this_board->n_ai_bits - 1));
-		}
 	}
 
 	return n;
@@ -135,7 +134,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	unsigned long iobase;
 
 	iobase = it->options[0];
-	printk("comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+	printk(KERN_INFO "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
 	if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
 		printk("I/O port conflict\n");
 		return -EIO;
@@ -166,11 +165,11 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int pcmad_detach(struct comedi_device *dev)
 {
-	printk("comedi%d: pcmad: remove\n", dev->minor);
+	printk(KERN_INFO "comedi%d: pcmad: remove\n", dev->minor);
 
-	if (dev->irq) {
+	if (dev->irq)
 		free_irq(dev->irq, dev);
-	}
+
 	if (dev->iobase)
 		release_region(dev->iobase, PCMAD_SIZE);