shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: adl_pci7x3x: fix digital output on PCI-7230

Browse Source 
commit ad83dbd974 upstream.

The "adl_pci7x3x" driver replaced the "adl_pci7230" and "adl_pci7432"
drivers in commits 8f567c373c ("staging: comedi: new adl_pci7x3x
driver") and 657f77d173 ("staging: comedi: remove adl_pci7230 and
adl_pci7432 drivers").  Although the new driver code agrees with the
user manuals for the respective boards, digital outputs stopped working
on the PCI-7230.  This has 16 digital output channels and the previous
adl_pci7230 driver shifted the 16 bit output state left by 16 bits
before writing to the hardware register.  The new adl_pci7x3x driver
doesn't do that.  Fix it in `adl_pci7x3x_do_insn_bits()` by checking
for the special case of the subdevice having only 16 channels and
duplicating the 16 bit output state into both halves of the 32-bit
register.  That should work both for what the board actually does and
for what the user manual says it should do.

Fixes: 8f567c373c ("staging: comedi: new adl_pci7x3x driver")
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott
2015-08-11 13:05:10 +01:00
committed by Greg Kroah-Hartman
parent 6ec7d68798
commit ba45b48d9b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/adl_pci7x3x.c
View File

@@ -119,10 +119,21 @@ static int adl_pci7x3x_do_insn_bits(struct comedi_device *dev,
unsigned int bits = data[1];
if (mask) {
unsigned int val;
s->state &= ~mask;
s->state |= (bits & mask);
outl(s->state, dev->iobase + reg);
val = s->state;
if (s->n_chan == 16) {
/*
* It seems the PCI-7230 needs the 16-bit DO state
* to be shifted left by 16 bits before being written
* to the 32-bit register. Set the value in both
* halves of the register to be sure.
*/
val |= val << 16;
}
outl(val, dev->iobase + reg);
}
/*