]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713
authorIan Abbott <abbotti@mev.co.uk>
Fri, 27 Dec 2019 17:00:54 +0000 (17:00 +0000)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 05:29:37 +0000 (00:29 -0500)
commite990e57445dd7368f608310d25b7ef4efd230163
tree05914665e7e146ba0a30bd388268ebcf9238b4cc
parent22b88653c7d3572b0a39cf1fbfcc952efeda5b01
staging: comedi: adv_pci1710: fix AI channels 16-31 for PCI-1713

BugLink: https://bugs.launchpad.net/bugs/1861934
commit a9d3a9cedc1330c720e0ddde1978a8e7771da5ab upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/staging/comedi/drivers/adv_pci1710.c