Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35338
b: refs/heads/master
c: b921c3d
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Jeff Garzik committed Sep 19, 2006
1 parent b766e8d commit ebac79d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53ccce2395cdc3693c22b9a94764b66dc1a4fcb4
refs/heads/master: b921c3d8b64fe12948088be049785de49be50990
6 changes: 4 additions & 2 deletions trunk/drivers/net/gt96100eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,9 @@ static int gt96100_init_module(void)
/*
* 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 = pci_find_device(PCI_VENDOR_ID_MARVELL,
!(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) {
printk(KERN_ERR __FILE__ ": GT96100 not found!\n");
return -ENODEV;
Expand All @@ -630,6 +630,8 @@ static int gt96100_init_module(void)

for (i=0; i < NUM_INTERFACES; i++)
retval |= gt96100_probe1(pci, i);

pci_dev_put(pci);

return retval;
}
Expand Down

0 comments on commit ebac79d

Please sign in to comment.