Patchwork r8169: fix early spinlock use

login
register
mail settings
Submitter fran├žois romieu
Date Oct. 9, 2008, 9:35 p.m.
Message ID <20081009213513.GB19429@electric-eye.fr.zoreil.com>
Download mbox | patch
Permalink /patch/3644/
State Accepted
Delegated to: David Miller
Headers show

Comments

fran├žois romieu - Oct. 9, 2008, 9:35 p.m.
rtl8169_init_one
-> rtl_init_mac_address
   -> rtl_rar_set
      -> spin_lock_irq(&tp->lock);
[...]
-> spin_lock_init(&tp->lock);

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---
 drivers/net/r8169.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
David Miller - Oct. 9, 2008, 9:36 p.m.
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Thu, 9 Oct 2008 23:35:13 +0200

> rtl8169_init_one
> -> rtl_init_mac_address
>    -> rtl_rar_set
>       -> spin_lock_irq(&tp->lock);
> [...]
> -> spin_lock_init(&tp->lock);
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Applied thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 108aaff..59fbc64 100644
--- a/drivers/net/r8169.c
+++ b/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;