---

yaml --- r: 317136 b: refs/heads/master c: 9f98900 h: refs/heads/master v: v3
git-mirror · Jun 5, 2012 · f8fb596 · f8fb596
1 parent b672e34
commit f8fb596
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a46e759fc05a048530da43f241c8f07e0624232c
+refs/heads/master: 9f989000b54fe3131104bb26f1cc7bd0fab92e40
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pc263.c b/trunk/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -330,8 +330,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	/* all outputs */
 	s->io_bits = 0xffff;
 	/* read initial relay state */
-	s->state = inb(dev->iobase);
-	s->state = s->state | (inb(dev->iobase) << 8);
+	s->state = inb(dev->iobase) | (inb(dev->iobase + 1) << 8);
 
 	printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
 	switch (thisboard->bustype) {