lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 06/96] staging: comedi: ssv_dnp: use comedi_dio_update_state()
    Date
    3.5.7.29 -stable review patch.  If anyone has any objections, please let me know.

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

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

    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 <hsweeten@visionengravers.com>
    Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
    [ Ian: Applies to all stable kernels from 2.6.32.y to 3.12.y ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/staging/comedi/drivers/ssv_dnp.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c
    index 16c4f5a..7f8a37e 100644
    --- a/drivers/staging/comedi/drivers/ssv_dnp.c
    +++ b/drivers/staging/comedi/drivers/ssv_dnp.c
    @@ -111,11 +111,11 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,

    /* 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;

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-01-13 19:41    [W:4.047 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site