Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 223183
b: refs/heads/master
c: f8e9616
h: refs/heads/master
i:
  223181: a3b9dbe
  223179: 77c2f2e
  223175: 3e00348
  223167: d795b4e
v: v3
  • Loading branch information
Vlad Lungu authored and David S. Miller committed Dec 2, 2010
1 parent 5334f5f commit b3c7d86
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7
refs/heads/master: f8e9616108c7003e6499c162459258f11c9dc85e
4 changes: 2 additions & 2 deletions trunk/drivers/net/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,8 @@ static int stmmac_probe(struct net_device *dev)
pr_warning("\tno valid MAC address;"
"please, use ifconfig or nwhwconfig!\n");

spin_lock_init(&priv->lock);

ret = register_netdev(dev);
if (ret) {
pr_err("%s: ERROR %i registering the device\n",
Expand All @@ -1520,8 +1522,6 @@ static int stmmac_probe(struct net_device *dev)
dev->name, (dev->features & NETIF_F_SG) ? "on" : "off",
(dev->features & NETIF_F_HW_CSUM) ? "on" : "off");

spin_lock_init(&priv->lock);

return ret;
}

Expand Down

0 comments on commit b3c7d86

Please sign in to comment.