staging: comedi: amplc_pc263: Correct initial state

The initial state of the relays is being read incorrectly.  It's reading
a single 8-bit port twice, but should be reading two consecutive 8-bit
ports.  Fix it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index 086579f756ff07f70ca83c70acede54d06f29c37..e2dbf74be81a7b0e5898d1e3d478af52f9ac8b56 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/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) {