aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-09-15 10:27:06 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-19 00:05:45 -0400
commitb921c3d8b64fe12948088be049785de49be50990 (patch)
tree426619f6bd1d9636cdace998a63ec6885c53fa72
parent53ccce2395cdc3693c22b9a94764b66dc1a4fcb4 (diff)
[PATCH] gt96100: move to pci_get_device API
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/gt96100eth.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 5a6d830754da..785c5bf4c6ea 100644
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -613,9 +613,9 @@ static int gt96100_init_module(void)
613 /* 613 /*
614 * Stupid probe because this really isn't a PCI device 614 * Stupid probe because this really isn't a PCI device
615 */ 615 */
616 if (!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL, 616 if (!(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
617 PCI_DEVICE_ID_MARVELL_GT96100, NULL)) && 617 PCI_DEVICE_ID_MARVELL_GT96100, NULL)) &&
618 !(pci = pci_find_device(PCI_VENDOR_ID_MARVELL, 618 !(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
619 PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) { 619 PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) {
620 printk(KERN_ERR __FILE__ ": GT96100 not found!\n"); 620 printk(KERN_ERR __FILE__ ": GT96100 not found!\n");
621 return -ENODEV; 621 return -ENODEV;
@@ -630,6 +630,8 @@ static int gt96100_init_module(void)
630 630
631 for (i=0; i < NUM_INTERFACES; i++) 631 for (i=0; i < NUM_INTERFACES; i++)
632 retval |= gt96100_probe1(pci, i); 632 retval |= gt96100_probe1(pci, i);
633
634 pci_dev_put(pci);
633 635
634 return retval; 636 return retval;
635} 637}