]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: comedi: daqboard2000: bug fix board type matching code
authorIan Abbott <abbotti@mev.co.uk>
Wed, 29 Jun 2016 19:27:44 +0000 (20:27 +0100)
committerWilly Tarreau <w@1wt.eu>
Wed, 19 Oct 2016 22:46:31 +0000 (00:46 +0200)
commit 80e162ee9b31d77d851b10f8c5299132be1e120f upstream.

`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: Willy Tarreau <w@1wt.eu>
drivers/staging/comedi/drivers/daqboard2000.c

index b87f95c3e17dbd7944fb815d6da77d6d235e06ab..1465a26b15cf38bbe45b9bcea871684456585a02 100644 (file)
@@ -678,7 +678,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++) {