diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2013-10-10 10:53:46 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 15:42:49 -0700 |
commit | 9712612a91e92824349ce9fece31dba6d2fbde70 (patch) | |
tree | be5d61695366371aeb4ac818d478f4a752ead1a9 /net | |
parent | d11fb4bbd90fd424834f51f8f85f6df51d76e5d9 (diff) | |
download | kernel-common-9712612a91e92824349ce9fece31dba6d2fbde70.tar.gz kernel-common-9712612a91e92824349ce9fece31dba6d2fbde70.tar.bz2 kernel-common-9712612a91e92824349ce9fece31dba6d2fbde70.zip |
staging: comedi: ni_65xx: (bug fix) confine insn_bits to one subdevice
commit 677a31565692d596ef42ea589b53ba289abf4713 upstream.
The `insn_bits` handler `ni_65xx_dio_insn_bits()` has a `for` loop that
currently writes (optionally) and reads back up to 5 "ports" consisting
of 8 channels each. It reads up to 32 1-bit channels but can only read
and write a whole port at once - it needs to handle up to 5 ports as the
first channel it reads might not be aligned on a port boundary. It
breaks out of the loop early if the next port it handles is beyond the
final port on the card. It also breaks out early on the 5th port in the
loop if the first channel was aligned. Unfortunately, it doesn't check
that the current port it is dealing with belongs to the comedi subdevice
the `insn_bits` handler is acting on. That's a bug.
Redo the `for` loop to terminate after the final port belonging to the
subdevice, changing the loop variable in the process to simplify things
a bit. The `for` loop could now try and handle more than 5 ports if the
subdevice has more than 40 channels, but the test `if (bitshift >= 32)`
ensures it will break out early after 4 or 5 ports (depending on whether
the first channel is aligned on a port boundary). (`bitshift` will be
between -7 and 7 inclusive on the first iteration, increasing by 8 for
each subsequent operation.)
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions