---

yaml
---
r: 363987
b: refs/heads/master
c: 64592df
h: refs/heads/master
i:
  363985: a182370
  363983: 162911b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd8de2ea012c94fb4d0fa385082d9dce26438265
+refs/heads/master: 64592df26f47a5b5512da2e23475bba5d918fbf6

trunk/drivers/staging/comedi/drivers/acl7225b.c

@@ -40,15 +40,19 @@ static int acl7225b_do_insn_bits(struct comedi_device *dev,
 				 struct comedi_insn *insn,
 				 unsigned int *data)
 {
-	if (data[0]) {
-		s->state &= ~data[0];
-		s->state |= (data[0] & data[1]);
+	unsigned long reg = (unsigned long)s->private;
+	unsigned int mask = data[0];
+	unsigned int bits = data[1];
+
+	if (mask) {
+		s->state &= ~mask;
+		s->state |= (bits & mask);
+
+		if (mask & 0x00ff)
+			outb(s->state & 0xff, dev->iobase + reg);
+		if (mask & 0xff00)
+			outb((s->state >> 8), dev->iobase + reg + 1);
 	}
-	if (data[0] & 0x00ff)
-		outb(s->state & 0xff, dev->iobase + (unsigned long)s->private);
-	if (data[0] & 0xff00)
-		outb((s->state >> 8),
-		     dev->iobase + (unsigned long)s->private + 1);
 
 	data[1] = s->state;