lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] gt96100: move to pci_get_device API

Browse Source 
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Alan Cox
2006-09-15 15:27:06 +01:00
committed by Jeff Garzik
parent 53ccce2395
commit b921c3d8b6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/gt96100eth.c
View File

@@ -613,9 +613,9 @@ static int gt96100_init_module(void)
/* /*
* Stupid probe because this really isn't a PCI device * Stupid probe because this really isn't a PCI device
*/ */
if (!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL, if (!(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
PCI_DEVICE_ID_MARVELL_GT96100, NULL)) && PCI_DEVICE_ID_MARVELL_GT96100, NULL)) &&
!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL, !(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) { PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) {
printk(KERN_ERR __FILE__ ": GT96100 not found!\n"); printk(KERN_ERR __FILE__ ": GT96100 not found!\n");
return -ENODEV; return -ENODEV;
@@ -631,6 +631,8 @@ static int gt96100_init_module(void)
for (i=0; i < NUM_INTERFACES; i++) for (i=0; i < NUM_INTERFACES; i++)
retval |= gt96100_probe1(pci, i); retval |= gt96100_probe1(pci, i);
pci_dev_put(pci);
return retval; return retval;
} }