aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorGravatar Ian Abbott <abbotti@mev.co.uk> 2016-06-29 20:27:44 +0100
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2016-08-21 17:07:19 +0200
commit80e162ee9b31d77d851b10f8c5299132be1e120f (patch)
tree2b5f7d0553ffb324f7c376c09c022d0a041422d0 /drivers/staging/comedi
parentstaging/lustre/llite: Close atomic_open race with several openers (diff)
downloadlinux-80e162ee9b31d77d851b10f8c5299132be1e120f.tar.gz
linux-80e162ee9b31d77d851b10f8c5299132be1e120f.tar.bz2
linux-80e162ee9b31d77d851b10f8c5299132be1e120f.zip
staging: comedi: daqboard2000: bug fix board type matching code
`daqboard2000_find_boardinfo()` is supposed to check if the DaqBoard/2000 series model is supported, based on the PCI subvendor and subdevice ID. The current code is wrong as it is comparing the PCI device's subdevice ID to an expected, fixed value for the subvendor ID. It should be comparing the PCI device's subvendor ID to this fixed value. Correct it. Fixes: 7e8401b23e7f ("staging: comedi: daqboard2000: add back subsystem_device check") Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: <stable@vger.kernel.org> # 3.7+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/drivers/daqboard2000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 65daef0c00d5..0f4eb954aa80 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -634,7 +634,7 @@ static const void *daqboard2000_find_boardinfo(struct comedi_device *dev,
const struct daq200_boardtype *board;
int i;
- if (pcidev->subsystem_device != PCI_VENDOR_ID_IOTECH)
+ if (pcidev->subsystem_vendor != PCI_VENDOR_ID_IOTECH)
return NULL;
for (i = 0; i < ARRAY_SIZE(boardtypes); i++) {