diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-07 18:47:47 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-07 18:47:47 -0600 |
| commit | 00629ac158e1be3124b796078cf0347b946cb053 (patch) | |
| tree | bcd75715575579ba26f6b96cd66627fdba3bf02d /drivers/staging/comedi/drivers/ssv_dnp.c | |
| parent | 2bf8ea63c7bb43b2b79ae3faa0797f1d83c6820c (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge tag 'v3.10.25' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.25-finallinux-lng-3.10.25-2014.01
This is the 3.10.25 stable release
Conflicts:
kernel/futex.c
Diffstat (limited to 'drivers/staging/comedi/drivers/ssv_dnp.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ssv_dnp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c b/drivers/staging/comedi/drivers/ssv_dnp.c index a76df092a57b..8c84dc0cfe07 100644 --- a/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/drivers/staging/comedi/drivers/ssv_dnp.c @@ -87,11 +87,11 @@ static int dnp_dio_insn_bits(struct comedi_device *dev, /* on return, data[1] contains the value of the digital input lines. */ outb(PADR, CSCIR); - data[0] = inb(CSCDR); + data[1] = inb(CSCDR); outb(PBDR, CSCIR); - data[0] += inb(CSCDR) << 8; + data[1] += inb(CSCDR) << 8; outb(PCDR, CSCIR); - data[0] += ((inb(CSCDR) & 0xF0) << 12); + data[1] += ((inb(CSCDR) & 0xF0) << 12); return insn->n; |