diff --git a/[refs] b/[refs] index 8ca4d021c3a0..8cc231aa1c52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d954e8edee5de90f8625c041ce177e04ae2c88fe +refs/heads/master: 6de2d20235a2b8c751d39ec4b68347d66b19d815 diff --git a/trunk/drivers/telephony/ixj.c b/trunk/drivers/telephony/ixj.c index 71cb64e41a1b..c7b0a357b04a 100644 --- a/trunk/drivers/telephony/ixj.c +++ b/trunk/drivers/telephony/ixj.c @@ -7692,7 +7692,7 @@ static int __init ixj_probe_pci(int *cnt) IXJ *j = NULL; for (i = 0; i < IXJMAX - *cnt; i++) { - pci = pci_find_device(PCI_VENDOR_ID_QUICKNET, + pci = pci_get_device(PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ, pci); if (!pci) break; @@ -7712,6 +7712,7 @@ static int __init ixj_probe_pci(int *cnt) printk(KERN_INFO "ixj: found Internet PhoneJACK PCI at 0x%x\n", j->DSPbase); ++*cnt; } + pci_dev_put(pci); return probe; }