Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713

The Advantech PCI-1713 has 32 analog input channels, but an incorrect
bit-mask in the definition of the `PCI171X_MUX_CHANH(x)` and
PCI171X_MUX_CHANL(x)` macros is causing channels 16 to 31 to be aliases
of channels 0 to 15. Change the bit-mask value from 0xf to 0xff to fix
it. Note that the channel numbers will have been range checked already,
so the bit-mask isn't really needed.

Fixes: 92c65e5553ed ("staging: comedi: adv_pci1710: define the mux control register bits")
Reported-by: Dmytro Fil <monkdaf@gmail.com>
Cc: <stable@vger.kernel.org> # v4.5+
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20191227170054.32051-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ian Abbott and committed by
Greg Kroah-Hartman
a9d3a9ce c0bcf9f3

+2 -2
+2 -2
drivers/staging/comedi/drivers/adv_pci1710.c
··· 46 46 #define PCI171X_RANGE_UNI BIT(4) 47 47 #define PCI171X_RANGE_GAIN(x) (((x) & 0x7) << 0) 48 48 #define PCI171X_MUX_REG 0x04 /* W: A/D multiplexor control */ 49 - #define PCI171X_MUX_CHANH(x) (((x) & 0xf) << 8) 50 - #define PCI171X_MUX_CHANL(x) (((x) & 0xf) << 0) 49 + #define PCI171X_MUX_CHANH(x) (((x) & 0xff) << 8) 50 + #define PCI171X_MUX_CHANL(x) (((x) & 0xff) << 0) 51 51 #define PCI171X_MUX_CHAN(x) (PCI171X_MUX_CHANH(x) | PCI171X_MUX_CHANL(x)) 52 52 #define PCI171X_STATUS_REG 0x06 /* R: status register */ 53 53 #define PCI171X_STATUS_IRQ BIT(11) /* 1=IRQ occurred */