lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 202/346] staging: comedi: daqboard2000: bug fix board type matching code
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    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
    @@ -684,7 +684,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++) {
    \
     
     \ /
      Last update: 2016-11-14 04:37    [W:4.150 / U:0.716 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site