Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332909
b: refs/heads/master
c: 4df1283
h: refs/heads/master
i:
  332907: 89ea56f
v: v3
  • Loading branch information
Peter Senna Tschudin authored and David S. Miller committed Oct 7, 2012
1 parent fcfe98d commit 6dc256e
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: 8c65ef4b8a21ab7edc7f35bb9a3892b0051b0158
refs/heads/master: 4df128341ed5728bc8d8f75709258967f8cc2f5f
3 changes: 2 additions & 1 deletion trunk/drivers/net/ethernet/sun/sungem.c
Original file line number Diff line number Diff line change
Expand Up @@ -2963,7 +2963,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
goto err_out_iounmap;
}

if (gem_get_device_address(gp))
err = gem_get_device_address(gp);
if (err)
goto err_out_free_consistent;

dev->netdev_ops = &gem_netdev_ops;
Expand Down

0 comments on commit 6dc256e

Please sign in to comment.