[PATCH 3.8 54/91] staging: comedi: amplc_pc263: correct insn_bits result

Kamal Mostafa kamal at canonical.com
Thu Jan 2 17:04:29 UTC 2014


3.8.13.15 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Ian Abbott <abbotti at mev.co.uk>

commit 97f4289ad08cffe55de06d4ac4f89ac540450aee upstream.

[Split from original patch subject: "staging: comedi: drivers: use
comedi_dio_update_state() for simple cases"]

Also, fix a bug in the amplc_pc263 and amplc_pci263 drivers where the
current state is not returned in data[1].

Signed-off-by: Ian Abbott <abbotti at mev.co.uk>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/staging/comedi/drivers/amplc_pc263.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index dfbff77..53b2ad9 100644
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -192,6 +192,9 @@ static int pc263_do_insn_bits(struct comedi_device *dev,
 		outb(s->state & 0xFF, dev->iobase);
 		outb(s->state >> 8, dev->iobase + 1);
 	}
+
+	data[1] = s->state;
+
 	return insn->n;
 }
 
-- 
1.8.3.2





More information about the kernel-team mailing list