Patch "staging: comedi: daqboard2000: bug fix board type matching code" has been added to the 4.4-stable tree

Patch "staging: comedi: daqboard2000: bug fix board type matching code" has been added to the 4.4-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    staging: comedi: daqboard2000: bug fix board type matching code

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     staging-comedi-daqboard2000-bug-fix-board-type-matching-code.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 80e162ee9b31d77d851b10f8c5299132be1e120f Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Wed, 29 Jun 2016 20:27:44 +0100
Subject: staging: comedi: daqboard2000: bug fix board type matching code

From: Ian Abbott <abbotti@mev.co.uk>

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>

---
 drivers/staging/comedi/drivers/daqboard2000.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -636,7 +636,7 @@ static const void *daqboard2000_find_boa
 	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++) {


Patches currently in stable-queue which might be from abbotti@mev.co.uk are

queue-4.4/staging-comedi-comedi_test-fix-timer-race-conditions.patch
queue-4.4/staging-comedi-ni_mio_common-fix-ao-inttrig-backwards-compatibility.patch
queue-4.4/staging-comedi-ni_mio_common-fix-wrong-insn_write-handler.patch
queue-4.4/staging-comedi-daqboard2000-bug-fix-board-type-matching-code.patch