diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 18:58:26 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 18:58:26 (GMT) |
| commit | c283cf384a7debe3fa421c4f77a375e111e8fcb5 (patch) | |
| tree | 62fdb0bd65d11ee4820db5c2ebad17fd0984b4bb /drivers/staging | |
| parent | 0edc7d8381b1d9f9c15d1590b057e9160032603b (diff) | |
| parent | 61ed59ed09e6ad2b8395178ea5ad5f653bba08e3 (diff) | |
| download | linux-fsl-qoriq-c283cf384a7debe3fa421c4f77a375e111e8fcb5.tar.xz | |
Merge branch 'staging-linus' into staging-next
Pick up 2 more comedi patches from Ian that are needed for other
changes in the future.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers/das08.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index c5676e2..67a914a 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/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, |