]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
staging: comedi: ni_daq_700: fix dio subdevice regression
authorFred Brooks <nsaspook@nsaspook.com>
Tue, 2 Oct 2012 10:10:26 +0000 (11:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Oct 2012 17:09:59 +0000 (10:09 -0700)
commit8098a2e23e88e979566c78e68aec11fa21808df0
treec753a5cc00477c9528307ae9cf283f87067884d3
parentd136f0fd47d9953139381c8af74976de86eeb224
staging: comedi: ni_daq_700: fix dio subdevice regression

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