diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:49:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:49:24 +0200 |
| commit | b397f82585c3101dcf92642dd359891e66d00c55 (patch) | |
| tree | 5f7f711b8582d723e1f4c0bb658b7dcaba656ad4 /drivers/isdn/hardware/mISDN/hfcmulti.c | |
| parent | b60080197af4a78ef0563c90cfca1074034def55 (diff) | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
Merge 5.1-rc3 into staging-next
We want those fixes and this resolves an erofs merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn/hardware/mISDN/hfcmulti.c')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcmulti.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 4d85645c87f7..0928fd1f0e0c 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c @@ -4365,7 +4365,8 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev, 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); |