diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2013-12-12 11:32:19 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 00:58:59 +0100 |
| commit | eafb3d2ee0052bf3f38ff01f4f1699ad0db20459 (patch) | |
| tree | 4b35067aadedee7e4e06eb9276451ba4d9017789 /drivers/staging/comedi | |
| parent | b10349aded21e5cab89ab99cbc2aa90d00314ee6 (diff) | |
| download | kernel_samsung_smdk4412-eafb3d2ee0052bf3f38ff01f4f1699ad0db20459.zip kernel_samsung_smdk4412-eafb3d2ee0052bf3f38ff01f4f1699ad0db20459.tar.gz kernel_samsung_smdk4412-eafb3d2ee0052bf3f38ff01f4f1699ad0db20459.tar.bz2 | |
staging: comedi: ssv_dnp: correct insn_bits result
[Part of commit f6b316bcd8c421acd6fa5a6e18b4c846ecb9d965 upstream.
Split from original patch subject: "staging: comedi: ssv_dnp: use
comedi_dio_update_state()"]
Also, fix a bug where the state of the channels is returned in data[0].
The comedi core expects it to be returned in data[1].
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/staging/comedi')
| -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 526de2e..0316780 100644 --- a/drivers/staging/comedi/drivers/ssv_dnp.c +++ b/drivers/staging/comedi/drivers/ssv_dnp.c @@ -251,11 +251,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 2; |