From a9743c7f434b36e48786abe020fcb57e3c6b1aa8 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 21 Sep 2009 16:05:01 -0400
Subject: [PATCH] --- yaml --- r: 167287 b: refs/heads/master c:
 078a10df24ac87d18c2d52fb501ff652f481fb5b h: refs/heads/master i:   167285:
 997846465ad17025abcfbc794254f3ea5213b5f8   167283:
 d179861430f1e019a80edfc109d0e5720ba26564   167279:
 81933b2bd81d04b29dedf9712674e8f8f37c79fe v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/comedi/drivers/ni_65xx.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26bff9237bff..089ef456d692 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b49d7c40ec0806d93ced89ac6039ddcf223dea7
+refs/heads/master: 078a10df24ac87d18c2d52fb501ff652f481fb5b
diff --git a/trunk/drivers/staging/comedi/drivers/ni_65xx.c b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
index b664ce083fc5..bbf75eb6d7f2 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_65xx.c
@@ -457,6 +457,12 @@ static int ni_65xx_dio_insn_bits(struct comedi_device *dev,
 		port_read_bits =
 		    readb(private(dev)->mite->daq_io_addr + Port_Data(port));
 /* printk("read 0x%x from port %i\n", port_read_bits, port); */
+		if (s->type == COMEDI_SUBD_DO && board(dev)->invert_outputs) {
+			/* Outputs inverted, so invert value read back from
+			 * DO subdevice.  (Does not apply to boards with DIO
+			 * subdevice.) */
+			port_read_bits ^= 0xFF;
+		}
 		if (bitshift > 0) {
 			port_read_bits <<= bitshift;
 		} else {