Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 97348
b: refs/heads/master
c: 7ad62db
h: refs/heads/master
v: v3
  • Loading branch information
Ilpo Järvinen authored and Jeff Garzik committed May 22, 2008
1 parent bc31b13 commit 67a4787
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 6941727a08d49c88a58bc3afb55044df7932549e
refs/heads/master: 7ad62dbcb5766dae38516e0333a6f68a1b6df884
3 changes: 2 additions & 1 deletion trunk/drivers/net/s2io.c
Original file line number Diff line number Diff line change
Expand Up @@ -1113,9 +1113,10 @@ static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev)
struct pci_dev *tdev = NULL;
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)
if (tdev->bus == s2io_pdev->bus->parent) {
pci_dev_put(tdev);
return 1;
}
}
}
return 0;
Expand Down

0 comments on commit 67a4787

Please sign in to comment.