From a93af1a444168cf2586c5c4925209960e570741f Mon Sep 17 00:00:00 2001
From: Klaas van Gend <klaas.van.gend@mvista.com>
Date: Thu, 22 Oct 2009 07:50:59 +0200
Subject: [PATCH] --- yaml --- r: 175094 b: refs/heads/master c:
 446176a7430f4dc311cda2200cd94336acbd0a6e h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/comedi/drivers/multiq3.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index df81c76a6870..c590bd4fe94f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bacf58a80330b540b5156aa27b9a796b6b3baae2
+refs/heads/master: 446176a7430f4dc311cda2200cd94336acbd0a6e
diff --git a/trunk/drivers/staging/comedi/drivers/multiq3.c b/trunk/drivers/staging/comedi/drivers/multiq3.c
index 5d6af9c459db..3aa9f23d344c 100644
--- a/trunk/drivers/staging/comedi/drivers/multiq3.c
+++ b/trunk/drivers/staging/comedi/drivers/multiq3.c
@@ -144,9 +144,8 @@ static int multiq3_ao_insn_read(struct comedi_device *dev,
 	int i;
 	int chan = CR_CHAN(insn->chanspec);
 
-	for (i = 0; i < insn->n; i++) {
+	for (i = 0; i < insn->n; i++)
 		data[i] = devpriv->ao_readback[chan];
-	}
 
 	return i;
 }
@@ -262,11 +261,10 @@ static int multiq3_attach(struct comedi_device *dev,
 	dev->iobase = iobase;
 
 	irq = it->options[1];
-	if (irq) {
+	if (irq)
 		printk("comedi%d: irq = %u ignored\n", dev->minor, irq);
-	} else {
+	else
 		printk("comedi%d: no irq\n", dev->minor);
-	}
 	dev->board_name = "multiq3";
 	result = alloc_subdevices(dev, 5);
 	if (result < 0)
@@ -332,12 +330,10 @@ static int multiq3_detach(struct comedi_device *dev)
 {
 	printk("comedi%d: multiq3: remove\n", dev->minor);
 
-	if (dev->iobase) {
+	if (dev->iobase)
 		release_region(dev->iobase, MULTIQ3_SIZE);
-	}
-	if (dev->irq) {
+	if (dev->irq)
 		free_irq(dev->irq, dev);
-	}
 
 	return 0;
 }