]> 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)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 20 Nov 2016 01:17:14 +0000 (01:17 +0000)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/staging/comedi/drivers/daqboard2000.c

index a8f6036ad82bc3dffc6711973d6c250ecaa93df4..746d7360cfed32131a7e7992d9df3621ff2db54b 100644 (file)
@@ -684,7 +684,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++) {