releases/3.4.75/staging-comedi-ssv_dnp-use-comedi_dio_update_state.patch

   1 From f6b316bcd8c421acd6fa5a6e18b4c846ecb9d965 Mon Sep 17 00:00:00 2001
   2 From: H Hartley Sweeten <hsweeten@visionengravers.com>
   3 Date: Fri, 30 Aug 2013 11:08:50 -0700
   4 Subject: staging: comedi: ssv_dnp: use comedi_dio_update_state()
   5
   6 From: H Hartley Sweeten <hsweeten@visionengravers.com>
   7
   8 commit f6b316bcd8c421acd6fa5a6e18b4c846ecb9d965 upstream.
   9
  10 Use comedi_dio_update_state() to handle the boilerplate code to update
  11 the subdevice s->state.
  12
  13 Also, fix a bug where the state of the channels is returned in data[0].
  14 The comedi core expects it to be returned in data[1].
  15
  16 Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
  17 Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/staging/comedi/drivers/ssv_dnp.c |    6 +++---
  22  1 file changed, 3 insertions(+), 3 deletions(-)
  23
  24 --- a/drivers/staging/comedi/drivers/ssv_dnp.c
  25 +++ b/drivers/staging/comedi/drivers/ssv_dnp.c
  26 @@ -251,11 +251,11 @@ static int dnp_dio_insn_bits(struct come
  27
  28         /* on return, data[1] contains the value of the digital input lines. */
  29         outb(PADR, CSCIR);
  30 -       data[0] = inb(CSCDR);
  31 +       data[1] = inb(CSCDR);
  32         outb(PBDR, CSCIR);
  33 -       data[0] += inb(CSCDR) << 8;
  34 +       data[1] += inb(CSCDR) << 8;
  35         outb(PCDR, CSCIR);
  36 -       data[0] += ((inb(CSCDR) & 0xF0) << 12);
  37 +       data[1] += ((inb(CSCDR) & 0xF0) << 12);
  38
  39         return 2;
  40