lkml.org 
[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 091/131] mISDN: hfcpci: Test both vendor & device ID for Digium HFC4S
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Bjorn Helgaas <bhelgaas@google.com>

    [ Upstream commit fae846e2b7124d4b076ef17791c73addf3b26350 ]

    The device ID alone does not uniquely identify a device. Test both the
    vendor and device ID to make sure we don't mistakenly think some other
    vendor's 0xB410 device is a Digium HFC4S. Also, instead of the bare hex
    ID, use the same constant (PCI_DEVICE_ID_DIGIUM_HFC4S) used in the device
    ID table.

    No functional change intended.

    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/isdn/hardware/mISDN/hfcmulti.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/isdn/hardware/mISDN/hfcmulti.c
    +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
    @@ -4370,7 +4370,8 @@ setup_pci(struct hfc_multi *hc, struct p
    if (m->clock2)
    test_and_set_bit(HFC_CHIP_CLOCK2, &hc->chip);

    - if (ent->device == 0xB410) {
    + if (ent->vendor == PCI_VENDOR_ID_DIGIUM &&
    + ent->device == PCI_DEVICE_ID_DIGIUM_HFC4S) {
    test_and_set_bit(HFC_CHIP_B410P, &hc->chip);
    test_and_set_bit(HFC_CHIP_PCM_MASTER, &hc->chip);
    test_and_clear_bit(HFC_CHIP_PCM_SLAVE, &hc->chip);

    \
     
     \ /
      Last update: 2019-04-01 19:46    [W:7.241 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site