Skip to contentSkip to conversation

patch "staging: comedi: daqboard2000: bug fix board type matching code" added to staging-linus

PATCH [email protected] 1 participant 1 message Aug 21, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 80e162ee9b31d77d851b10f8c5299132be1e120f Mon Sep 17 00:00:00 2001

From: Ian Abbott <[email protected]>
Date: Wed, 29 Jun 2016 20:27:44 +0100
Subject: 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")

---
 drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/comedi/drivers/daqboard2000.c +1 -1
index 65daef0c00d5..0f4eb954aa80 100644
@@ -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++) {
Signature · 1 line
2.9.3