diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2016-06-29 20:27:44 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-09-12 09:44:43 -0400 |
| commit | 33f100b86ffdb9bdfe682bb3b148dca1b8c1aefa (patch) | |
| tree | 228a81edda061144b1704a7afb268ea6fb85c858 | |
| parent | f8ce587f25d100e9afe29dfac5c6273e52311cc5 (diff) | |
| download | lwn-33f100b86ffdb9bdfe682bb3b148dca1b8c1aefa.tar.gz lwn-33f100b86ffdb9bdfe682bb3b148dca1b8c1aefa.zip | |
staging: comedi: daqboard2000: bug fix board type matching code
[ Upstream commit 80e162ee9b31d77d851b10f8c5299132be1e120f ]
`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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/staging/comedi/drivers/daqboard2000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index f97d18d92255..63c338223548 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c @@ -636,7 +636,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++) { |