Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df58ef51 authored by Francois Romieu's avatar Francois Romieu Committed by David S. Miller
Browse files

r8169: fix early spinlock use 



rtl8169_init_one
-> rtl_init_mac_address
   -> rtl_rar_set
      -> spin_lock_irq(&tp->lock);
[...]
-> spin_lock_init(&tp->lock);

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d74a6bd

drivers/net/r8169.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -1952,7 +1952,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev->do_ioctl = rtl8169_ioctl;

		dev->do_ioctl = rtl8169_ioctl;

	}

	}





	/* Read MAC address from EEPROM */

	spin_lock_init(&tp->lock);



	rtl_init_mac_address(tp, ioaddr);

	rtl_init_mac_address(tp, ioaddr);





	/* Get MAC address */

	/* 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.data = (unsigned long) dev;

	tp->timer.function = rtl8169_phy_timer;

	tp->timer.function = rtl8169_phy_timer;





	spin_lock_init(&tp->lock);



	rc = register_netdev(dev);

	rc = register_netdev(dev);

	if (rc < 0)

	if (rc < 0)

		goto err_out_msi_5;

		goto err_out_msi_5;