From b3c7d862704c68cfd3695ae053ebbca7e181ead5 Mon Sep 17 00:00:00 2001
From: Vlad Lungu <vlad.lungu@windriver.com>
Date: Mon, 29 Nov 2010 22:52:52 +0000
Subject: [PATCH] --- yaml --- r: 223183 b: refs/heads/master c:
 f8e9616108c7003e6499c162459258f11c9dc85e h: refs/heads/master i:   223181:
 a3b9dbed2c8d273e35916d07b59b045cc29a7529   223179:
 77c2f2ee3917d1e615628586f945291631d842b3   223175:
 3e003489a7c9ee3ec0f804a36570ec959bd9aa96   223167:
 d795b4e02d0eb7cff0c4b68f50370aae906b7a37 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/stmmac/stmmac_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0826aaa6ec9b..fa31c50d5658 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7
+refs/heads/master: f8e9616108c7003e6499c162459258f11c9dc85e
diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
index 06bc6034ce81..2114837809e7 100644
--- a/trunk/drivers/net/stmmac/stmmac_main.c
+++ b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -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",
@@ -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;
 }