aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2012-08-31 20:41:30 +0100
committerBen Hutchings <ben@decadent.org.uk>2012-09-19 15:05:07 +0100
commitf707d86130d5d292c0f2b19d1bd8f2cad128c929 (patch)
treee620a5797dd29e76f164a95c4229c67dff0b4f77 /drivers/staging/comedi
parent7672832a4ebe555d580a0cdb41a09da0cb8264ba (diff)
downloadkernel_samsung_smdk4412-f707d86130d5d292c0f2b19d1bd8f2cad128c929.zip
kernel_samsung_smdk4412-f707d86130d5d292c0f2b19d1bd8f2cad128c929.tar.gz
kernel_samsung_smdk4412-f707d86130d5d292c0f2b19d1bd8f2cad128c929.tar.bz2
staging: comedi: das08: Correct AO output for das08jr-16-ao
commit 61ed59ed09e6ad2b8395178ea5ad5f653bba08e3 upstream. Don't zero out bits 15..12 of the data value in `das08jr_ao_winsn()` as that knobbles the upper three-quarters of the output range for the 'das08jr-16-ao' board. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/das08.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index dc4ef4c..a48fe88 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -655,7 +655,7 @@ static int das08jr_ao_winsn(struct comedi_device *dev,
int chan;
lsb = data[0] & 0xff;
- msb = (data[0] >> 8) & 0xf;
+ msb = (data[0] >> 8) & 0xff;
chan = CR_CHAN(insn->chanspec);