From: Willy Tarreau <w@1wt.eu>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ian Abbott <abbotti@mev.co.uk>, stable@vger.kernel.org#3.7+,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Willy Tarreau <w@1wt.eu>
Subject: [PATCH 3.10 10/16] staging: comedi: daqboard2000: bug fix board type matching code
Date: Thu, 20 Oct 2016 00:49:34 +0200 [thread overview]
Message-ID: <1476917380-28311-11-git-send-email-w@1wt.eu> (raw)
In-Reply-To: <1476917380-28311-1-git-send-email-w@1wt.eu>
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>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index b87f95c..1465a26 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -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++) {
--
2.8.0.rc2.1.gbe9624a
next prev parent reply other threads:[~2016-10-19 22:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-19 22:49 [PATCH 3.10 00/16] 3.10.104-stable review Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 01/16] Revert "powerpc/tm: Always reclaim in start_thread() for exec() class syscalls" Willy Tarreau
2016-10-20 3:07 ` Guenter Roeck
2016-10-20 6:12 ` Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 02/16] PCI: Support PCIe devices with short cfg_size Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 03/16] PCI: Add Netronome vendor and device IDs Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 04/16] PCI: Limit config space size for Netronome NFP6000 family Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 05/16] PCI: Add Netronome NFP4000 PF device ID Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 06/16] PCI: Limit config space size for Netronome NFP4000 Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 07/16] aacraid: Check size values after double-fetch from user Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 08/16] megaraid_sas: Fix probing cards without io port Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 09/16] crypto: nx - off by one bug in nx_of_update_msc() Willy Tarreau
2016-10-19 22:49 ` Willy Tarreau [this message]
2016-10-19 22:49 ` [PATCH 3.10 11/16] ACPI / sysfs: fix error code in get_status() Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 12/16] mm: thp: fix SMP race condition between THP page fault and MADV_DONTNEED Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 13/16] MIPS: KVM: Check for pfn noslot case Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 14/16] security: let security modules use PTRACE_MODE_* with bitmasks Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 15/16] xen-netback: ref count shared rings Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 16/16] mm: remove gup_flags FOLL_WRITE games from __get_user_pages() Willy Tarreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476917380-28311-11-git-send-email-w@1wt.eu \
--to=w@1wt.eu \
--cc=abbotti@mev.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stable@vger.kernel.org#3.7+ \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®