Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166701
b: refs/heads/master
c: f191422
h: refs/heads/master
i:
  166699: e13eefd
v: v3
  • Loading branch information
Mike McCormack authored and David S. Miller committed Oct 1, 2009
1 parent 91ccd25 commit 725aec7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 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: ec1652af18ef02c7c6ceeabb64f56f16eaf40ae9
refs/heads/master: f1914226e12044f0cacda59efc91bee972c30341
9 changes: 6 additions & 3 deletions trunk/drivers/net/skge.c
Original file line number Diff line number Diff line change
Expand Up @@ -3982,14 +3982,17 @@ static int __devinit skge_probe(struct pci_dev *pdev,
}
skge_show_addr(dev);

if (hw->ports > 1 && (dev1 = skge_devinit(hw, 1, using_dac))) {
if (register_netdev(dev1) == 0)
if (hw->ports > 1) {
dev1 = skge_devinit(hw, 1, using_dac);
if (dev1 && register_netdev(dev1) == 0)
skge_show_addr(dev1);
else {
/* Failure to register second port need not be fatal */
dev_warn(&pdev->dev, "register of second port failed\n");
hw->dev[1] = NULL;
free_netdev(dev1);
hw->ports = 1;
if (dev1)
free_netdev(dev1);
}
}
pci_set_drvdata(pdev, hw);
Expand Down

0 comments on commit 725aec7

Please sign in to comment.