From dbce632f690f994e0873c4fd72210fecf3826151 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Sep 2012 11:58:26 -0700 Subject: [PATCH] --- yaml --- r: 324652 b: refs/heads/master c: c283cf384a7debe3fa421c4f77a375e111e8fcb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das08.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c8d0f95b18ea..6e832f0cf103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0edc7d8381b1d9f9c15d1590b057e9160032603b +refs/heads/master: c283cf384a7debe3fa421c4f77a375e111e8fcb5 diff --git a/trunk/drivers/staging/comedi/drivers/das08.c b/trunk/drivers/staging/comedi/drivers/das08.c index c5676e267518..67a914a10b55 100644 --- a/trunk/drivers/staging/comedi/drivers/das08.c +++ b/trunk/drivers/staging/comedi/drivers/das08.c @@ -378,7 +378,7 @@ das08jr_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, int chan; lsb = data[0] & 0xff; - msb = (data[0] >> 8) & 0xf; + msb = (data[0] >> 8) & 0xff; chan = CR_CHAN(insn->chanspec); @@ -623,7 +623,7 @@ static const struct das08_board_struct das08_boards[] = { .ai = das08_ai_rinsn, .ai_nbits = 16, .ai_pg = das08_pg_none, - .ai_encoding = das08_encode12, + .ai_encoding = das08_encode16, .ao = das08jr_ao_winsn, .ao_nbits = 16, .di = das08jr_di_rbits,