From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Fri, 15 Sep 2006 14:22:51 +0000 (+0100)
Subject: [PATCH] s2io: Switch to pci_get_device
X-Git-Tag: v2.6.19-rc1~1263^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=26d36b642e2f024019f94819284a11273807571d;p=linux-2.6-omap-h63xx.git

[PATCH] s2io: Switch to pci_get_device

We want the pci devices ref counted against hotplug.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 54205910753..d579a44aab5 100644
--- a/drivers/net/s2io.c
+++ b/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;
 		}
 	}