r8169: fix early spinlock use
authorFrancois Romieu <romieu@fr.zoreil.com>
Thu, 9 Oct 2008 21:35:58 +0000 (14:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Oct 2008 21:35:58 +0000 (14:35 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/r8169.c

index 108aaff0b2113721d19341617cfbb07975275c5e..59fbc64d7c479636b033b60f8dc6e4a44046423c 100644 (file)
@@ -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;