From 1f0b2c9bb14bb6ae928f0da089bbe164995fc435 Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 9 Oct 2008 14:35:58 -0700
Subject: [PATCH] --- yaml --- r: 112237 b: refs/heads/master c:
 df58ef51caea073f4b45857c51f445f65267dac7 h: refs/heads/master i:   112235:
 4cef6651df5657cfd7a6219796d5c5bb5eeb8100 v: v3

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

diff --git a/[refs] b/[refs]
index 2ab6dfcae20b..bef35dc6ba22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d74a6bddf647285e7aa4e9ca4ec16eb071dfd95
+refs/heads/master: df58ef51caea073f4b45857c51f445f65267dac7
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 108aaff0b211..59fbc64d7c47 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -1952,7 +1952,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		dev->do_ioctl = rtl8169_ioctl;
 	}
 
-	/* Read MAC address from EEPROM */
+	spin_lock_init(&tp->lock);
+
 	rtl_init_mac_address(tp, ioaddr);
 
 	/* Get MAC address */
@@ -1995,8 +1996,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	tp->timer.data = (unsigned long) dev;
 	tp->timer.function = rtl8169_phy_timer;
 
-	spin_lock_init(&tp->lock);
-
 	rc = register_netdev(dev);
 	if (rc < 0)
 		goto err_out_msi_5;