From 9565f76cdb9e7502df83c8ee4351c07394194858 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 12:30:30 -0800 Subject: [PATCH] 3.4-stable patches added patches: staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch --- queue-3.4/series | 1 + ...-ssv_dnp-use-comedi_dio_update_state.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-3.4/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch diff --git a/queue-3.4/series b/queue-3.4/series index 141011987c2..b1ac2642e08 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -25,3 +25,4 @@ dm-delay-fix-a-possible-deadlock-due-to-shared-workqueue.patch dm-table-fail-dm_table_create-on-dm_round_up-overflow.patch nfs-fix-do_div-warning-by-instead-using-sector_div.patch staging-comedi-pcmuio-fix-possible-null-deref-on-detach.patch +staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch diff --git a/queue-3.4/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch b/queue-3.4/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch new file mode 100644 index 00000000000..d2f85955533 --- /dev/null +++ b/queue-3.4/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch @@ -0,0 +1,40 @@ +From f6b316bcd8c421acd6fa5a6e18b4c846ecb9d965 Mon Sep 17 00:00:00 2001 +From: H Hartley Sweeten +Date: Fri, 30 Aug 2013 11:08:50 -0700 +Subject: staging: comedi: ssv_dnp: use comedi_dio_update_state() + +From: H Hartley Sweeten + +commit f6b316bcd8c421acd6fa5a6e18b4c846ecb9d965 upstream. + +Use comedi_dio_update_state() to handle the boilerplate code to update +the subdevice s->state. + +Also, fix a bug where the state of the channels is returned in data[0]. +The comedi core expects it to be returned in data[1]. + +Signed-off-by: H Hartley Sweeten +Reviewed-by: Ian Abbott +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/comedi/drivers/ssv_dnp.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/staging/comedi/drivers/ssv_dnp.c ++++ b/drivers/staging/comedi/drivers/ssv_dnp.c +@@ -251,11 +251,11 @@ static int dnp_dio_insn_bits(struct come + + /* on return, data[1] contains the value of the digital input lines. */ + outb(PADR, CSCIR); +- data[0] = inb(CSCDR); ++ data[1] = inb(CSCDR); + outb(PBDR, CSCIR); +- data[0] += inb(CSCDR) << 8; ++ data[1] += inb(CSCDR) << 8; + outb(PCDR, CSCIR); +- data[0] += ((inb(CSCDR) & 0xF0) << 12); ++ data[1] += ((inb(CSCDR) & 0xF0) << 12); + + return 2; + -- 2.47.3