lkml.org 
[lkml]   [2016]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 10/16] staging: comedi: daqboard2000: bug fix board type matching code
    Date
    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
    \
     
     \ /
      Last update: 2016-10-20 00:54    [W:0.022 / U:17.980 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site