patch "staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713" added to staging-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From a9d3a9cedc1330c720e0ddde1978a8e7771da5ab Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Fri, 27 Dec 2019 17:00:54 +0000
Subject: 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.
--- drivers/staging/comedi/drivers/adv_pci1710.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/comedi/drivers/adv_pci1710.c +2 -2
@@ -46,8 +46,8 @@#define PCI171X_RANGE_UNI BIT(4)#define PCI171X_RANGE_GAIN (x) (((x) & 0x7) << 0)#define PCI171X_MUX_REG 0x04/* W: A/D multiplexor control */ -#define PCI171X_MUX_CHANH (x) (((x) & 0xf) << 8) -#define PCI171X_MUX_CHANL (x) (((x) & 0xf) << 0) +#define PCI171X_MUX_CHANH (x) (((x) & 0xff) << 8) +#define PCI171X_MUX_CHANL (x) (((x) & 0xff) << 0)#define PCI171X_MUX_CHAN (x) (PCI171X_MUX_CHANH(x) | PCI171X_MUX_CHANL(x))#define PCI171X_STATUS_REG 0x06/* R: status register */ #define PCI171X_STATUS_IRQ BIT(11)/* 1=IRQ occurred */
Signature · 1 line
2.24.1