From 6ea91e8e6474ea96989995db8ce0beb8af9d6999 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 15 Sep 2006 15:22:51 +0100 Subject: [PATCH] --- yaml --- r: 35339 b: refs/heads/master c: 26d36b642e2f024019f94819284a11273807571d h: refs/heads/master i: 35337: b766e8d4098c6add4cd000452bcdce6bedc9e85f 35335: 09c296e121821b85f8065c8af087f58b2b69853d v: v3 --- [refs] | 2 +- trunk/drivers/net/s2io.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ad42a36c4def..dce9b121e11d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b921c3d8b64fe12948088be049785de49be50990 +refs/heads/master: 26d36b642e2f024019f94819284a11273807571d diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 542059107538..d579a44aab5c 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -855,9 +855,10 @@ static int s2io_verify_pci_mode(nic_t *nic) static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev) { struct pci_dev *tdev = NULL; - while ((tdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, tdev)) != NULL) { - if ((tdev->vendor == NEC_VENID) && (tdev->device == NEC_DEVID)){ + while ((tdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, tdev)) != NULL) { + if (tdev->vendor == NEC_VENID && tdev->device == NEC_DEVID) { if (tdev->bus == s2io_pdev->bus->parent) + pci_dev_put(tdev); return 1; } }