lkml.org 
[lkml]   [2012]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 029/101] staging: comedi: ni_daq_700: fix dio subdevice regression
    Date
    3.6-stable review patch.  If anyone has any objections, please let me know.

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

    From: Fred Brooks <nsaspook@nsaspook.com>

    commit 6681e63399926651cc29bcb9d92229b6f1cf1daa upstream.

    Here is a small patch to fix a problem caused by a previous patch that
    removed the callback function. The callback remove patch:
    http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1de02225358988e8fd48d1dc3fd12336bbae258a

    I finally booted my dev machine on the latest kernel (running Debian
    here so it's still on 3.2 normally) to test the ni_daq_700 driver with
    my test program and noticed this bug.

    Shift the DIO_R read result to bits 8..15 Digital direction
    configuration: channels 0-7 output, 8-15 input (8225 device emu as port
    A output, port B input, port C N/A).

    Signed-off-by: Fred Brooks <nsaspook@nsaspook.com>
    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/comedi/drivers/ni_daq_700.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/staging/comedi/drivers/ni_daq_700.c
    +++ b/drivers/staging/comedi/drivers/ni_daq_700.c
    @@ -71,7 +71,7 @@ static int subdev_700_insn(struct comedi
    }

    data[1] = s->state & 0xff;
    - data[1] |= inb(dev->iobase + DIO_R);
    + data[1] |= inb(dev->iobase + DIO_R) << 8;

    return insn->n;
    }



    \
     
     \ /
      Last update: 2012-10-30 00:21    [W:2.196 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site