Commit ba45b48d authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

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

commit ad83dbd9 upstream.

The "adl_pci7x3x" driver replaced the "adl_pci7230" and "adl_pci7432"
drivers in commits 8f567c37 ("staging: comedi: new adl_pci7x3x
driver") and 657f77d1 ("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: 8f567c37 ("staging: comedi: new adl_pci7x3x driver")
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ec7d687
...@@ -119,10 +119,21 @@ static int adl_pci7x3x_do_insn_bits(struct comedi_device *dev, ...@@ -119,10 +119,21 @@ static int adl_pci7x3x_do_insn_bits(struct comedi_device *dev,
unsigned int bits = data[1]; unsigned int bits = data[1];
if (mask) { if (mask) {
unsigned int val;
s->state &= ~mask; s->state &= ~mask;
s->state |= (bits & mask); s->state |= (bits & mask);
val = s->state;
outl(s->state, dev->iobase + reg); 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);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment