Skip to content

Commit

Permalink
r8169: fix early spinlock use
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Francois Romieu authored and David S. Miller committed Oct 9, 2008
1 parent 1d74a6b commit df58ef5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/net/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit df58ef5

Please sign in to comment.